--- a/tests/test-merge7.t Thu Sep 16 16:00:29 2010 +0200
+++ b/tests/test-merge7.t Sun Sep 12 18:05:53 2010 -0500
@@ -47,7 +47,7 @@
warning: conflicts during merge.
merging test.txt failed!
0 files updated, 0 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
resolve conflict
$ cat >test.txt <<"EOF"
> one
@@ -91,7 +91,7 @@
warning: conflicts during merge.
merging test.txt failed!
0 files updated, 0 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
$ cat test.txt
one