Mercurial > hg
changeset 21402:c915d066bcac
help: add additional information in the merge-tools section of config help
The merge tool configuration in general has always been a confusing topic for
user. We add mention of:
- possible pre-existing configuration,
- way to look at it,
- the more detailed help topic about how merge-tools configuration works.
This should help users find they way.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Mon, 12 May 2014 17:40:58 -0700 |
| parents | 2c364f7801c8 |
| children | 3db723e2dc20 |
| files | mercurial/help/config.txt |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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``::