This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3cf40112efb7: xdiff: remove xmerge related logic (authored
by quark, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2706?vs=6684=6688
REVISION
indygreg accepted this revision.
indygreg added a comment.
This revision is now accepted and ready to land.
Good riddance to hard-to-read C code.
Thank you for doing this.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2706
To: quark, #hg-reviewers,
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
hg has its own merge algorithm with flexible config options.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2706
AFFECTED FILES
