From c60fe7f6a9c1acbde28946c1aa8536cba442a36a Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Tue, 8 Dec 2015 09:47:06 +0000
Subject: [PATCH] Better prototype

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@9734 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/diff3.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/diff3.php b/lib/diff3.php
index 6d3aaaff3..0cf845234 100644
--- a/lib/diff3.php
+++ b/lib/diff3.php
@@ -192,7 +192,7 @@ class Diff3
         return $blocks;
     }
 
-    public function merged_output($label1 = false, $label2 = false)
+    public function merged_output($label1 = '', $label2 = '')
     {
         $lines = array();
         foreach ($this->blocks as $block) {
-- 
2.45.0