Mercurial > hg
diff contrib/mergetools.hgrc @ 11308:16277f8aca1a
mergetools: add configuration for Ultra Compare (issue2226)
Initial config provided by Tim Pietzcker
author | Steve Borho <steve@borho.org> |
---|---|
date | Tue, 08 Jun 2010 11:58:09 -0500 |
parents | 7d99edddbaea |
children | 48e549d7c6ae |
line wrap: on
line diff
--- a/contrib/mergetools.hgrc Tue Jun 08 14:12:46 2010 +0200 +++ b/contrib/mergetools.hgrc Tue Jun 08 11:58:09 2010 -0500 @@ -101,3 +101,12 @@ 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