[phpwiki-checkins] SF.net SVN: phpwiki:[9734] trunk/lib/diff3.php

[<var...@us...>]

Revision: 9734
          http://sourceforge.net/p/phpwiki/code/9734
Author:   vargenau
Date:     2015-12-08 09:47:06 +0000 (Tue, 08 Dec 2015)
Log Message:
-----------
Better prototype

Modified Paths:
--------------
    trunk/lib/diff3.php

Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2015-10-15 08:07:53 UTC (rev 9733)
+++ trunk/lib/diff3.php	2015-12-08 09:47:06 UTC (rev 9734)
@@ -192,7 +192,7 @@
         return $blocks;
     }
 
-    public function merged_output($label1 = false, $label2 = false)
+    public function merged_output($label1 = '', $label2 = '')
     {
         $lines = array();
         foreach ($this->blocks as $block) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.