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

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

Removed special FIXME handling in run-tests, added bug info to .out files.
Removed special FIXME handling in run-tests, added bug info to .out files.
mpm@selenic.com - - Load All Authors

File last commit:

r814:0902ffec merge default
r833:ad8ff353 default
Show More
test-merge2.out
25 lines | 475 B | text/plain | TextLexer
/ tests / test-merge2.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 b
+ hg commit -m commit #2 -d 0 0
+ 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 commit -A -m commit #2 -d 0 0
adding 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 remove b
+ hg update 0
+ hg commit -A -m commit #2 -d 0 0
adding b