diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-04-30 08:24:02 +0200 |
|---|---|---|
| committer | Michael Grosse <grosse@cosmocode.de> | 2016-04-13 11:51:51 +0200 |
| commit | a297e675b310055196e041491f6f31444bc7e423 (patch) | |
| tree | 0c2861884532138df05595e9f058785038cc4fb4 /lib/scripts/jquery | |
| parent | 7468fb90ed3db204b9b4dd52f819fc0574320ed6 (diff) | |
| download | dokuwiki-a297e675b310055196e041491f6f31444bc7e423.tar.gz dokuwiki-a297e675b310055196e041491f6f31444bc7e423.zip | |
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
Diffstat (limited to 'lib/scripts/jquery')
0 files changed, 0 insertions, 0 deletions