--- a/tests/test-convert-svn-sink.out Thu Sep 16 16:00:29 2010 +0200
+++ b/tests/test-convert-svn-sink.out Sun Sep 12 18:05:53 2010 -0500
@@ -265,7 +265,7 @@
warning: conflicts during merge.
merging b failed!
2 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
assuming destination b-hg
initializing svn repository 'b-hg'
initializing svn working copy 'b-hg-wc'