##// END OF EJS Templates
merge: check that there are no conflicts after --abort...
merge: check that there are no conflicts after --abort Same idea as in abcc82bf0717 (clean: check that there are no conflicts after, 2020-01-24). We should reuse more code here, but that will come later. Differential Revision: https://phab.mercurial-scm.org/D7994

File last commit:

r38029:e51c91c1 default
r44636:2b6632d6 default
Show More
default-tools.rc
5 lines | 62 B | text/x-stsrc | TextLexer
[ui]
editor = sensible-editor
[pager]
pager = sensible-pager