[PATCH 3 of 3] doc: improves merge-tools example with a vimdiff one

pierre-yves.david at logilab.fr pierre-yves.david at logilab.fr
Thu Aug 2 07:21:52 CDT 2012


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1343908294 -7200
# Branch stable
# Node ID 114532fce44bf8f798dfd58474cee1a7fd0ab093
# Parent  68604f26c8b5962dd6bfc3099f6fa3e428fbc91d
doc: improves merge-tools example with a vimdiff one

The vimdiff example show the `check` argument and explicit way `priority` works.
Another benefit is to have the vimdiff configuration directly available in the
doc. This is valuable as vimdiff is a common request from user.

diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -807,10 +807,17 @@ Example ``~/.hgrc``::
   # Define new tool
   myHtmlTool.args = -m $local $other $base $output
   myHtmlTool.regkey = Software\FooSoftware\HtmlMerge
   myHtmlTool.priority = 1
 
+  # Define fallback tool
+  vimdiff.args=$local $other $base
+  # detect unchanged files as potential conflict
+  vimdiff.check=changed
+  # give priority lower than gui tool
+  vimdiff.priority=0
+
 Supported arguments:
 
 ``priority``
   The priority in which to evaluate this tool.
   Default: 0.


More information about the Mercurial-devel mailing list