--- a/tests/test-merge9.out Thu Apr 10 14:25:50 2008 +0200
+++ b/tests/test-merge9.out Thu Apr 10 15:02:24 2008 -0500
@@ -5,7 +5,7 @@
created new head
merging bar
merging bar failed!
-merging foo and baz
+merging foo and baz to baz
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
hg update -C 2
@@ -13,7 +13,7 @@
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging bar
merging bar failed!
-merging baz and foo
+merging baz and foo to baz
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
hg update -C 1