From 81e850aaf037378622b6ff1bdede783db6fd3232 Mon Sep 17 00:00:00 2001
From: Pierre-Yves David <pierre-yves.david@fb.com>
Date: Thu, 2 Aug 2012 13:51:34 +0200
Subject: [PATCH] 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 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
index 8565204a0e..0cdedee265 100644
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -821,6 +821,9 @@ Example ``~/.hgrc``::
   # 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