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

r37944:b8c2004a default
r38875:9b077e5f @74 default
Show More
test-ui-color.py.out
5 lines | 56 B | text/plain | TextLexer
/ tests / test-ui-color.py.out
warning
error
b'buffered\n'
colored? True
colored? True