From: Lawrence A. <la...@us...> - 2002-02-14 23:13:50
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory usw-pr-cvs1:/tmp/cvs-serv27698/lib Modified Files: diff3.php Log Message: Did it properly this time Index: diff3.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/diff3.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -I^#: -d -r1.2 -r1.3 --- diff3.php 14 Feb 2002 23:12:31 -0000 1.2 +++ diff3.php 14 Feb 2002 23:13:46 -0000 1.3 @@ -1,5 +1,5 @@ <?php -//rcs_id('$Id$'); +rcs_id('$Id$'); // diff3.php // // A class for computing three way diffs @@ -117,11 +117,11 @@ $e1 = current($edits1); $e2 = current($edits2); while ($e1 || $e2) { -/* echo "====\n"; - print_r($e1); - print_r($e2); - echo "====\n"; - */ +// echo "====\n"; +// print_r($e1); +// print_r($e2); +// echo "====\n"; + if ($e1 && $e2 && $e1->type == 'copy' && $e2->type == 'copy') { // We have copy blocks from both diffs. This is the (only) // time we want to emit a diff3 copy block. |