Submitter | Pierre-Yves David |
---|---|
Date | May 15, 2014, 6:16 a.m. |
Message ID | <537e136661e8aba78973.1400134611@marginatus.alto.octopoid.net> |
Download | mbox | patch |
Permalink | /patch/4753/ |
State | Accepted |
Headers | show |
Comments
On 05/14/2014 11:16 PM, pierre-yves.david@ens-lyon.org wrote: > # HG changeset patch > # User Pierre-Yves David <pierre-yves.david@fb.com> > # Date 1343908294 -7200 > # Thu Aug 02 13:51:34 2012 +0200 > # Node ID 537e136661e8aba78973f8278002e85951f13c6c > # Parent a3d54d20b2a5ad66a69946504ec1247ead4734b2 > doc: improves merge-tools example with an overwrite of existing config I queued them after applying the siddharth fix. Siddharth gave me blessing for this.
Patch
diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt --- a/mercurial/help/config.txt +++ b/mercurial/help/config.txt @@ -819,10 +819,13 @@ Example ``~/.hgrc``:: # Specify command line kdiff3.args = $base $local $other -o $output # Give higher priority kdiff3.priority = 1 + # Changing the priority of preconfigured tool + vimdiff.priority = 0 + # Define new tool myHtmlTool.args = -m $local $other $base $output myHtmlTool.regkey = Software\FooSoftware\HtmlMerge myHtmlTool.priority = 1