--- a/tests/test-merge6.out Tue Aug 16 17:30:41 2005 -0800
+++ b/tests/test-merge6.out Tue Aug 16 19:03:01 2005 -0800
@@ -1,13 +1,3 @@
-+ hg init
-+ hg add foo bar
-+ hg commit -m commit text -d 0 0
-+ hg clone A1 B1
-+ hg remove bar
-+ hg commit -m commit test -d 0 0
-+ hg commit -m commit test -d 0 0
-+ hg clone A1 A2
-+ hg clone B1 B2
-+ hg pull ../B1
pulling from ../B1
searching for changes
adding changesets
@@ -15,12 +5,8 @@
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
-+ hg update -m
-+ hg commit -m commit test -d 0 0
bar should remain deleted.
-+ hg manifest
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
-+ hg pull ../A2
pulling from ../A2
searching for changes
adding changesets
@@ -28,8 +14,5 @@
adding file changes
added 1 changesets with 0 changes to 0 files
(run 'hg update' to get a working copy)
-+ hg update -m
-+ hg commit -m commit test -d 0 0
bar should remain deleted.
-+ hg manifest
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo