--- a/tests/test-log.t Thu Sep 16 16:00:29 2010 +0200
+++ b/tests/test-log.t Sun Sep 12 18:05:53 2010 -0500
@@ -898,7 +898,7 @@
warning: conflicts during merge.
merging foo 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
$ echo 'merge 1' > foo
$ hg resolve -m foo
$ hg ci -m "First merge, related"
@@ -908,7 +908,7 @@
warning: conflicts during merge.
merging foo failed!
1 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
$ echo 'merge 2' > foo
$ hg resolve -m foo
$ hg ci -m "Last merge, related"