--- a/tests/test-topic.t	Tue Apr 24 08:57:18 2018 +0100
+++ b/tests/test-topic.t	Mon Apr 23 12:11:10 2018 +0200
@@ -402,7 +402,7 @@
   merging alpha
   warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ hg revert -r narf alpha
   $ hg resolve -m alpha