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

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

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
Pierre-Yves David - - Load All Authors

File last commit:

r22023:f1883065 default
r38875:9b077e5f @74 default
Show More
test-simplemerge.py.out
5 lines | 115 B | text/plain | TextLexer
/ tests / test-simplemerge.py.out
History | Annotation | Raw |Copy content |Copy permalink
................
----------------------------------------------------------------------
Ran 16 tests in 0.000s
OK