--- a/tests/test-merge9.t Thu Sep 16 16:00:29 2010 +0200
+++ b/tests/test-merge9.t Sun Sep 12 18:05:53 2010 -0500
@@ -30,7 +30,7 @@
merging bar failed!
merging foo and baz to baz
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
- use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
+ use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
$ hg resolve -l
U bar
R baz
@@ -43,7 +43,7 @@
merging bar failed!
merging baz and foo to baz
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
- use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
+ use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
show unresolved
$ hg resolve -l