--- a/tests/test-backout.out	Mon May 01 19:17:34 2006 +0200
+++ b/tests/test-backout.out	Tue May 02 18:44:02 2006 +0200
@@ -16,4 +16,6 @@
 changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23
 merging with changeset 2:b66ea5b77abb
 merging a
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
 line 1