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

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

Incorporated most of Aron Griffis suggestions for sh compatibility.
Incorporated most of Aron Griffis suggestions for sh compatibility.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r801:1f9ec150 default
r804:19388dcb default
Show More
test-merge1.out
45 lines | 832 B | text/plain | TextLexer
/ tests / test-merge1.out
History | Annotation | Raw |Copy content |Copy permalink
+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg update 0
+ hg add c
+ hg commit -m commit #2 -d 0 0
+ hg update -m 1
+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg update 0
+ hg add c
+ hg commit -m commit #2 -d 0 0
+ hg update -m 1
merging for b
merging b
+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg commit -m commit #2 -d 0 0
+ hg update 1
+ hg add c
+ hg commit -m commit #3 -d 0 0
This is file b1
+ hg update -m 2
merging for b
merging b
+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg commit -m commit #2 -d 0 0
+ hg update 1
+ hg add c
+ hg commit -m commit #3 -d 0 0
+ hg update -m 2
merging for b
merging b