##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: demonstrate how conflict markers end up $local *and* $output...
tests: demonstrate how conflict markers end up $local *and* $output When a merge tool is configured to keep conflict markers, they are supposed to be written to `$local` if `$output` is not mentioned in the tool's `merge-tools.<tool>.args` config, and in `$output` if it is mentioned. However, I broke the latter case in D12190. Differential Revision: https://phab.mercurial-scm.org/D12378
Gregory Szorc - - Load All Authors

File last commit:

r38029:e51c91c1 default
r49822:b10a944c stable
Show More
default-tools.rc
5 lines | 62 B | text/x-stsrc | TextLexer
/ contrib / packaging / debian / default-tools.rc
History | Annotation | Raw |Copy content |Copy permalink
[ui]
editor = sensible-editor
[pager]
pager = sensible-pager