--- a/tests/test-merge-remove.out Fri Mar 21 00:55:53 2008 +0100
+++ b/tests/test-merge-remove.out Fri Mar 21 11:06:02 2008 +0100
@@ -1,3 +1,4 @@
+created new head
merging foo1 and foo
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)