diff -r 2912881c2a98 -r f2daa6ab514a tests/test-mq-qnew.out
--- a/tests/test-mq-qnew.out	Thu Sep 16 16:00:29 2010 +0200
+++ b/tests/test-mq-qnew.out	Sun Sep 12 18:05:53 2010 -0500
@@ -53,7 +53,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
 abort: cannot manage merge changesets
 %%% hg headers
 adding a
@@ -116,5 +116,5 @@
 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
 abort: cannot manage merge changesets