tests/test-merge1.out
changeset 3329 f472cf9a71af
parent 3328 49966b5ab16f
parent 3317 966632304dde
child 3407 d2b55e3c4e25
--- a/tests/test-merge1.out
+++ b/tests/test-merge1.out
@@ -1,7 +1,5 @@
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 %% no merges expected
-merging for b
-merging b
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 diff -r d9e5953b9dec b
@@ -31,8 +29,6 @@ This is file b1
 %% merge fails
 abort: outstanding uncommitted changes
 %% merge expected!
-merging for b
-merging b
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 diff -r c1dd73cbf59f b