--- a/tests/test-push-warn.out Mon May 01 19:17:34 2006 +0200
+++ b/tests/test-push-warn.out Tue May 02 18:44:02 2006 +0200
@@ -1,3 +1,4 @@
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pushing to ../a
searching for changes
abort: unsynced remote changes!
@@ -13,6 +14,8 @@
searching for changes
abort: push creates new remote branches!
(did you forget to merge? use push -f to force)
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
pushing to ../a
searching for changes
adding changesets
@@ -20,7 +23,12 @@
adding file changes
added 2 changesets with 1 changes to 1 files
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
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging foo
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
pushing to ../c
searching for changes
abort: push creates new remote branches!