##// END OF EJS Templates
xdiff: remove xmerge related logic...
xdiff: remove xmerge related logic hg has its own merge algorithm with flexible config options. Differential Revision: https://phab.mercurial-scm.org/D2706

File last commit:

r26148:7f49efca default
r36782:3cf40112 default
Show More
compat
1 line | 2 B | text/plain | TextLexer
9