diff -r fcfb6a0a0a84 -r 92ccccb55ba3 tests/test-convert-svn-sink.out
--- a/tests/test-convert-svn-sink.out	Fri Apr 11 12:04:26 2008 +0200
+++ b/tests/test-convert-svn-sink.out	Fri Apr 11 12:52:56 2008 -0500
@@ -265,9 +265,7 @@
 warning: conflicts during merge.
 merging b failed!
 2 files updated, 0 files merged, 0 files removed, 1 files unresolved
-There are unresolved merges, you can redo the full merge using:
-  hg update -C 2
-  hg merge 4
+use 'hg resolve' to retry unresolved file merges
 assuming destination b-hg
 initializing svn repo 'b-hg'
 initializing svn wc 'b-hg-wc'