Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc: improves merge-tools example with an overwrite of existing config
authorPierre-Yves David <pierre-yves.david@fb.com>
Thu, 02 Aug 2012 13:51:34 +0200
changeset 21403 3db723e2dc20
parent 21402 c915d066bcac
child 21404 ca275f7ec576
doc: improves merge-tools example with an overwrite of existing config We highlight the fact that a user hgrc can overwrite the system wide preconfiguration. As other benefit we show priority value other than 1 and shows vimdiff configuration is usually directly available. This is valuable as vimdiff is (surprisingly) a common request from user.
mercurial/help/config.txt file | annotate | diff | comparison | revisions 
--- a/mercurial/help/config.txt	Mon May 12 17:40:58 2014 -0700
+++ b/mercurial/help/config.txt	Thu Aug 02 13:51:34 2012 +0200
@@ -821,6 +821,9 @@
   # 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
mercurial