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

login
register
mail settings
Submitter Pierre-Yves David
Date May 15, 2014, 6:16 a.m.
Message ID <a3d54d20b2a5ad66a699.1400134610@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/4752/
State Accepted
Headers show

Comments

Pierre-Yves David - May 15, 2014, 6:16 a.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@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.
Siddharth Agarwal - May 15, 2014, 4:41 p.m.
On 05/14/2014 11:16 PM, pierre-yves.david@ens-lyon.org wrote:
> +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.

"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."

Patch

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