tests/test-merge1.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 29 Jul 2005 15:21:02 +0100
changeset 801 1f9ec150a476
parent 749 7e4843b7efd2
child 808 8f5637f0a0c0
permissions -rw-r--r--
Updated output of tests.

+ 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