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