diff -r ad558f297eb1 -r a31557193f3c tests/test-merge1.out
--- a/tests/test-merge1.out	Tue Aug 22 16:47:27 2006 -0500
+++ b/tests/test-merge1.out	Tue Aug 22 17:08:38 2006 -0500
@@ -1,6 +1,8 @@
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 %% no merges expected
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+merging for b
+merging b
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 %% merge should fail