# HG changeset patch
# User Steve Borho <steve@borho.org>
# Date 2010-06-08 16:58:09
# Node ID 16277f8aca1add68b62ec7bfdef45573d31071ba
# Parent  7f72031d4047624271cd90d1396a0bf2709c29e9

mergetools: add configuration for Ultra Compare (issue2226)

Initial config provided by Tim Pietzcker

diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc
+++ b/contrib/mergetools.hgrc
@@ -101,3 +101,12 @@ diffuse.priority=-3
 diffuse.args=$local $base $other
 diffuse.gui=True
 diffuse.diffargs=$parent $child
+
+UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
+UltraCompare.args = $base $local $other -title1 base -title3 other
+UltraCompare.priority = -2
+UltraCompare.gui = True
+UltraCompare.binary = True
+UltraCompare.checkconflicts = True
+UltraCompare.checkchanged = True
+UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1