diff -r d91c2fa1c248 -r b87861f57222 tests/test-keyword.t
--- a/tests/test-keyword.t	Fri Sep 10 21:22:11 2010 +0200
+++ b/tests/test-keyword.t	Sun Sep 12 18:05:53 2010 -0500
@@ -817,7 +817,7 @@
   warning: conflicts during merge.
   merging m 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 m
   $Id$
   <<<<<<< local