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