##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

mergetools: add configuration for Ultra Compare (issue2226)...
Steve Borho -
r11308:16277f8a default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -101,3 +101,12 b' diffuse.priority=-3'
101 diffuse.args=$local $base $other
101 diffuse.args=$local $base $other
102 diffuse.gui=True
102 diffuse.gui=True
103 diffuse.diffargs=$parent $child
103 diffuse.diffargs=$parent $child
104
105 UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
106 UltraCompare.args = $base $local $other -title1 base -title3 other
107 UltraCompare.priority = -2
108 UltraCompare.gui = True
109 UltraCompare.binary = True
110 UltraCompare.checkconflicts = True
111 UltraCompare.checkchanged = True
112 UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1
General Comments 0
You need to be logged in to leave comments. Login now