##// END OF EJS Templates
shelve: use more accurate description in conflict marker...
shelve: use more accurate description in conflict marker We use "shelve" and "working-copy" instead of "source" and "dest". This is a net win. Differential Revision: https://phab.mercurial-scm.org/D3694

File last commit:

r31685:d83e5165 default
r38875:9b077e5f @74 default
Show More
test-config-env.py.out
6 lines | 126 B | text/plain | TextLexer
/ tests / test-config-env.py.out
pager.pager=p0 # $TESTTMP/sysrc:4
ui.editor=e1 # $TESTTMP/userrc:2
pager.pager=p2 # $PAGER
ui.editor=e1 # $TESTTMP/userrc:2