--- a/tests/test-stabilize-result.t	Fri Oct 28 15:17:27 2016 -0700
+++ b/tests/test-stabilize-result.t	Fri Oct 28 17:11:43 2016 -0700
@@ -359,7 +359,7 @@
   merging a
   warning: conflicts while merging a! (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 update -C .' to abort
   abort: merge conflict between several amendments (this is not automated yet)
   (/!\ You can try:
   /!\ * manual merge + resolve => new cset X