diff -r 2912881c2a98 -r f2daa6ab514a tests/test-conflict.t
--- a/tests/test-conflict.t	Thu Sep 16 16:00:29 2010 +0200
+++ b/tests/test-conflict.t	Sun Sep 12 18:05:53 2010 -0500
@@ -15,7 +15,7 @@
   warning: conflicts during merge.
   merging a 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
 
   $ hg id
   32e80765d7fe+75234512624c+ tip