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

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

run-tests.py: pass -L/--label to simplemerge...
run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.
Patrick Mezard - - Load All Authors

File last commit:

r4333:4f721e96 default
r4387:93a4e72b default
Show More
test-mq-merge.out
11 lines | 195 B | text/plain | TextLexer
/ tests / test-mq-merge.out
History | Annotation | Raw |Copy content |Copy permalink
adding a
adding b
copy .hg/patches to .hg/patches.1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
M b
a
b
merging with queue at: .hg/patches.1
applying rm_a
Now at: rm_a
b