diff -r 3ada044340be -r 247bb7a2c492 tests/test-help.t
--- a/tests/test-help.t	Sat May 06 10:18:34 2017 -0500
+++ b/tests/test-help.t	Sat May 06 02:33:00 2017 +0900
@@ -1831,7 +1831,7 @@
          but it will by default not be used for symlinks and binary files.
       7. If the file to be merged is not binary and is not a symlink, then
          internal ":merge" is used.
-      8. The merge of the file fails and must be resolved before commit.
+      8. Otherwise, ":prompt" is used.
   
       Note:
          After selecting a merge program, Mercurial will by default attempt to