tests/test-resolve.t
changeset 12314 f2daa6ab514a
parent 12117 a40372c1c731
child 12316 4134686b83e1
--- a/tests/test-resolve.t	Thu Sep 16 16:00:29 2010 +0200
+++ b/tests/test-resolve.t	Sun Sep 12 18:05:53 2010 -0500
@@ -23,7 +23,7 @@
 
   $ HGMERGE=internal:fail hg merge
   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 resolved > file
   $ hg resolve -m file