Mercurial > hg-stable
changeset 32116:247bb7a2c492 stable
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 | 3ada044340be |
| children | 1b27e1793156 |
| files | mercurial/help/merge-tools.txt tests/test-help.t |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
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::
--- 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