]> CyberLeo.Net >> Repos - SourceForge/phpwiki.git/history - lib/diff3.php
Activated Id substitution for Subversion
[SourceForge/phpwiki.git] / lib / diff3.php
2008-08-22 vargenauActivated Id substitution for Subversion
2002-08-20 rurbanfixed Conflicting Edits Bug from http://phpwiki.sourc...
2002-02-15 lakkaMergeConflictingEdits done. The merge is automatic...
2002-02-14 lakkaDid it properly this time
2002-02-14 lakkaCorrected a typo and removed some stray debugging code
2001-12-16 dairikiAdded three-way diff engine. (Beginning of support for