tests/test-commit-unresolved.t
changeset 12314 f2daa6ab514a
parent 11804 6c24465613de
child 12316 4134686b83e1
--- a/tests/test-commit-unresolved.t	Thu Sep 16 16:00:29 2010 +0200
+++ b/tests/test-commit-unresolved.t	Sun Sep 12 18:05:53 2010 -0500
@@ -31,7 +31,7 @@
   warning: conflicts during merge.
   merging A 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
 
 Correct the conflict without marking the file as resolved