--- a/tests/test-rename-merge2.t Thu Jan 04 21:37:03 2018 -0800
+++ b/tests/test-rename-merge2.t Mon Jan 08 19:41:47 2018 +0530
@@ -713,7 +713,7 @@
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
0 files updated, 2 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
--------------
M a
M b
@@ -758,7 +758,7 @@
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
0 files updated, 2 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
--------------
M b
C a