Mercurial > hg-stable
diff mercurial/help/config.txt @ 40528:86dfae98a3a2
merge-tools: when calling external merge tool, describe the resolve inputs
It is a common complaint that a user will be running some operation (histedit,
rebase, evolve, etc.), get into a merge-conflict situation, and not understand
what they are seeing - it is possible that the merge tool is configured to
display the hash, but it's difficult for most merge tools to display a good
snippet of the description.
In the worst case, configuring this template will lead to output that is
immediately covered by a terminal application, maybe the user can hit ctrl-z to
see it. In the common case, the output will be in a terminal window and a GUI
program will start, and it should be possible to view both the terminal and the
GUI program at the same time.
Differential Revision: https://phab.mercurial-scm.org/D5094
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Sat, 13 Oct 2018 07:49:20 -0700 |
parents | e928bedf0919 |
children | 840cd57cde32 |
line wrap: on
line diff
--- a/mercurial/help/config.txt Fri Oct 26 21:46:37 2018 +0900 +++ b/mercurial/help/config.txt Sat Oct 13 07:49:20 2018 -0700 @@ -2296,6 +2296,16 @@ On Windows, this configuration option is ignored and the command aborted. +``pre-merge-tool-output-template`` + A template that is printed before executing an external merge tool. This can + be used to print out additional context that might be useful to have during + the conflict resolution, such as the description of the various commits + involved or bookmarks/tags. + + Additional information is available in the ``local`, ``base``, and ``other`` + dicts. For example: ``{local.label}``, ``{base.name}``, or + ``{other.islink}``. + ``quiet`` Reduce the amount of output printed. (default: False)