Skip to content
Snippets Groups Projects
  1. Apr 20, 2016
  2. Apr 19, 2016
  3. Apr 18, 2016
  4. Apr 16, 2016
  5. Apr 15, 2016
  6. Apr 14, 2016
  7. Apr 13, 2016
    • Andreas Gohr's avatar
      34df7cb0
    • Andreas Gohr's avatar
      Added 3way merge from PEAR Text_Diff3 · a297e675
      Andreas Gohr authored
      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
      a297e675
Loading