--- a/tests/test-status-color.t	Thu Jan 04 21:37:03 2018 -0800
+++ b/tests/test-status-color.t	Mon Jan 08 19:41:47 2018 +0530
@@ -379,7 +379,7 @@
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 2 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 resolve -m b