##// 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:

r26299:79e1064f default
r36782:3cf40112 default
Show More
hgkpath.rc
2 lines | 38 B | text/x-stsrc | TextLexer
[hgk]
path = /usr/share/mercurial/hgk