--- a/tests/test-convert-svn-sink.out	Wed Mar 04 17:02:16 2009 -0600
+++ b/tests/test-convert-svn-sink.out	Wed Mar 04 13:06:16 2009 -0600
@@ -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
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 assuming destination b-hg
 initializing svn repo 'b-hg'
 initializing svn wc 'b-hg-wc'