Searched hist:a297e675b310055196e041491f6f31444bc7e423 (Results 1 – 1 of 1) sorted by relevance
| /dokuwiki/inc/ |
| H A D | DifferenceEngine.php | a297e675b310055196e041491f6f31444bc7e423 Sat Apr 30 06:24:02 UTC 2011 Andreas Gohr <andi@splitbrain.org> Added 3way merge from PEAR Text_Diff3
This adds 3way merge functionality to our DifferenceEngine stack. The
code was taken from the PEAR Text_Diff3 package and adapted to work with
our implementation.
For the curious:
Here's a short Origin tree of the different versions of the Diff code to
make clear how our implementation is related to the PEAR package.
-- original code Geoffrey T. Dairiki
`-- Adaption for the Horde project
|-- Adaption for phpwiki
| `-- Adaption for MediaWiki
| `-- Adaption for DokuWiki
`-- Creation of PEAR Text_Diff
|