diff -r 6096acdc7d37 -r 14fbb847be5a tests/test-topic.t
--- a/tests/test-topic.t	Sat Jan 20 11:13:21 2018 +0100
+++ b/tests/test-topic.t	Fri Jan 19 19:18:05 2018 +0100
@@ -384,7 +384,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 update -C .' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
   $ hg revert -r narf alpha
   $ hg resolve -m alpha