diff --git a/tests/test-merge-internal-tools-pattern b/tests/test-merge-internal-tools-pattern
old mode 100644
new mode 100755
diff --git a/tests/test-merge-internal-tools-pattern.out b/tests/test-merge-internal-tools-pattern.out
--- a/tests/test-merge-internal-tools-pattern.out
+++ b/tests/test-merge-internal-tools-pattern.out
@@ -9,9 +9,7 @@ 1 files updated, 0 files merged, 0 files
 created new head
 # merge using internal:fail tool
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-There are unresolved merges, you can redo the full merge using:
-  hg update -C 2
-  hg merge 1
+use 'hg resolve' to retry unresolved file merges
 line 1
 line 2
 third line