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