Mercurial > public > mercurial-scm > hg-stable

diff mercurial/help/merge-tools.txt @ 32116:247bb7a2c492 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: describe about choice of :prompt as a fallback merge tool explicitly "merge-tools" help topic has described that the merge of the file fails if no tool is found to merge binary or symlink, since c77f6276c9e7 (or Mercurial 1.7), which based on (already removed) MergeProgram wiki page. But even at that revision, and of course now, merge of the file doesn't fail automatically for binary/symlink. ":prompt" (or equivalent logic) is used, if there is no appropriate tool configuration for binary/symlink.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 06 May 2017 02:33:00 +0900
parents 38e0363dcbe0
children ff178743e59b
line wrap: on
line diff
--- a/mercurial/help/merge-tools.txt	Sat May 06 10:18:34 2017 -0500
+++ b/mercurial/help/merge-tools.txt	Sat May 06 02:33:00 2017 +0900
@@ -70,7 +70,7 @@
 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::