diff -r 9a50ffd15b25 -r 41ef02ba329b tests/test-convert-svn-sink.t
--- a/tests/test-convert-svn-sink.t	Thu Jan 04 21:37:03 2018 -0800
+++ b/tests/test-convert-svn-sink.t	Mon Jan 08 19:41:47 2018 +0530
@@ -384,7 +384,7 @@
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   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 merge --abort' to abandon
   [1]
   $ hg --cwd b revert -r 2 b
   $ hg --cwd b resolve -m b