--- a/tests/test-merge1.out Tue Aug 16 17:30:41 2005 -0800
+++ b/tests/test-merge1.out Tue Aug 16 19:03:01 2005 -0800
@@ -1,45 +1,7 @@
-+ 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