--- a/tests/test-excessive-merge.out Mon May 01 19:17:34 2006 +0200
+++ b/tests/test-excessive-merge.out Tue May 02 18:44:02 2006 +0200
@@ -1,3 +1,9 @@
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
changeset: 4:f6c172c6198c
tag: tip
parent: 1:448a8c5e42f1