[PATCH 1 of 2] help: add additional information in the merge-tools section of config help

pierre-yves.david at ens-lyon.org pierre-yves.david at ens-lyon.org
Thu May 15 01:16:50 CDT 2014


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at fb.com>
# Date 1399941658 25200
#      Mon May 12 17:40:58 2014 -0700
# Node ID a3d54d20b2a5ad66a69946504ec1247ead4734b2
# Parent  bcddddcf0b540b1d98f0dc1f1a1bef9337e2e567
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.

diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -805,11 +805,13 @@ Example::
 
 ``merge-tools``
 ---------------
 
 This section configures external merge tools to use for file-level
-merges.
+merges. This section has likely be preconfigured at install time,
+use :hg:`config merge-tools` to check existing configuration. Also
+check :hg:`help merge-tools` for details on this topic.
 
 Example ``~/.hgrc``::
 
   [merge-tools]
   # Override stock tool location


More information about the Mercurial-devel mailing list