changeset 21402 | c915d066bcac |
parent 20532 | f1a3ae7c15df |
child 21403 | 3db723e2dc20 |
--- a/mercurial/help/config.txt Wed May 07 00:13:22 2014 +0200 +++ b/mercurial/help/config.txt Mon May 12 17:40:58 2014 -0700 @@ -807,7 +807,9 @@ --------------- This section configures external merge tools to use for file-level -merges. +merges. This section has likely been preconfigured at install time. +Use :hg:`config merge-tools` to check the existing configuration. +Also see :hg:`help merge-tools` for more details. Example ``~/.hgrc``::