diff -r 5c0bd13bd771 -r 67a28636ea64 tests/test-merge1.out
--- a/tests/test-merge1.out	Tue Sep 13 14:23:43 2005 -0500
+++ b/tests/test-merge1.out	Tue Sep 13 18:38:27 2005 -0500
@@ -1,7 +1,13 @@
+%% no merges expected
+%% merge of b expected
 merging for b
 merging b
+%%
+Contents of b should be "this is file b1"
 This is file b1
+%% merge expected!
 merging for b
 merging b
+%% merge of b expected
 merging for b
 merging b