--- a/mercurial/helptext/config.txt Fri Oct 23 15:59:32 2020 -0700
+++ b/mercurial/helptext/config.txt Mon Oct 26 10:33:32 2020 -0700
@@ -2440,14 +2440,7 @@
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}``.
+ (DEPRECATED) Use ``command-template.pre-merge-tool-output`` instead.
``quiet``
Reduce the amount of output printed.
@@ -2575,6 +2568,16 @@
Can be overridden per-merge-tool, see the ``[merge-tools]`` section.
+``pre-merge-tool-output``
+ 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}``.
+
``web``
-------