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

r32065:dc82c977 stable
r36782:3cf40112 default
Show More
default-tools.rc
5 lines | 62 B | text/x-stsrc | TextLexer
[ui]
editor = sensible-editor
[pager]
pager = sensible-pager