--- a/tests/test-merge7.out	Sun Mar 12 20:34:09 2006 +0100
+++ b/tests/test-merge7.out	Mon Mar 13 08:56:59 2006 +0100
@@ -24,6 +24,8 @@
 resolving test.txt
 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557
 merging test.txt failed!
+0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+(branch merge, don't forget to commit)
 one
 <<<<<<<
 two-point-five