comparison mercurial/help/config.txt @ 40478: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

40477:592feb3f88b1

    .. container:: windows

      On Windows, this configuration option is ignored and the command aborted.

``quiet``
    Reduce the amount of output printed.
    (default: False)

``remotecmd``

40478:86dfae98a3a2

    .. container:: windows

      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)

``remotecmd``