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

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

Make test-pull work on slow machines, where hg serve needs some time to start.
Make test-pull work on slow machines, where hg serve needs some time to start.
mpm@selenic.com - - Load All Authors

File last commit:

r749:7e4843b7 default
r790:d7380783 default
Show More
test-merge4.out
15 lines | 318 B | text/plain | TextLexer
/ tests / test-merge4.out
History | Annotation | Raw |Copy content |Copy permalink
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ hg update 0
+ echo This is file c1
+ hg add c
+ hg commit -m 'commit #2' -d '0 0'
+ hg update -m 1
+ rm b
+ echo This is file c22
+ hg commit -m 'commit #3' -d '0 0'