Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.1, 2.0.2, and 2.0.3

stable mergetools: add alternate registry keys for x86 apps on x64 (fixes #209)

I've confirmed this works for DiffMerge and KDiff3 and the workarounds were not
necessary for Araxis Merge (64 bit app) or Beyond Compare (installs keys under
HKCU). This patch depends on a Mercurial change to be effective.

Changeset d03d26dcfee6…

Parent 6a683121c2f2…

by Steve Borho

Changes to one file · Browse files at d03d26dcfee6 Showing diff from parent 6a683121c2f2 Diff from another changeset...

Change 1 of 8 Show Entire File contrib/​mergetools.rc Stacked
 
44
45
46
 
47
48
49
 
56
57
58
 
59
60
61
 
65
66
67
 
68
69
70
 
77
78
79
 
80
81
82
 
87
88
89
 
90
91
92
 
95
96
97
 
98
99
100
 
102
103
104
 
105
106
107
 
171
172
173
 
174
175
176
 
44
45
46
47
48
49
50
 
57
58
59
60
61
62
63
 
67
68
69
70
71
72
73
 
80
81
82
83
84
85
86
 
91
92
93
94
95
96
97
 
100
101
102
103
104
105
106
 
108
109
110
111
112
113
114
 
178
179
180
181
182
183
184
@@ -44,6 +44,7 @@
 araxis.dir3diff=True    UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe +UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe  UltraCompare.args = $base $local $other -title1 base -title3 other  UltraCompare.priority = -2  UltraCompare.gui = True @@ -56,6 +57,7 @@
 kdiff3.priority=-3  kdiff3.args=--auto --L1 base --L2 parent1 --L3 parent2 $base $local $other -o $output  kdiff3.regkey=Software\KDiff3 +kdiff3.regkeyalt=Software\Wow6432Node\KDiff3  kdiff3.regappend=\kdiff3.exe  kdiff3.fixeol=False  kdiff3.premerge=False @@ -65,6 +67,7 @@
 kdiff3.dirdiff=True    diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\ +diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\  diffmerge.regname=Location  diffmerge.priority=-7  diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output @@ -77,6 +80,7 @@
 p4merge.priority=-8  p4merge.args=$base $local $other $output  p4merge.regkey=Software\Perforce\Environment +p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment  p4merge.regname=P4INSTROOT  p4merge.regappend=\p4merge.exe  p4merge.gui=True @@ -87,6 +91,7 @@
 tortoisemerge.priority=-9  tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output  tortoisemerge.regkey=Software\TortoiseSVN +tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN  tortoisemerge.checkchanged=True  tortoisemerge.gui=True  tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel' @@ -95,6 +100,7 @@
 ecmerge.priority=-10  ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output  ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge +ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge  ecmerge.gui=True  ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel'  ecmerge.diff3args=$child $parent1 $parent2 --mode=diff3 --title0='$clabel' --title1='$plabel1' --title2='$plabel2' @@ -102,6 +108,7 @@
 ecmerge.dir3diff=True    winmergeu.regkey=Software\Thingamahoochie\WinMerge\ +winmergeu.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\  winmergeu.regname=Executable  winmergeu.priority=-10  winmergeu.args=/e /x /wl /ub /dl other /dr local $other $local $output @@ -171,6 +178,7 @@
   ; Telelogic Rhapsody DiffMerge Tool  rhapsody_diffmerge.regkey=Software\Telelogic\Rhapsody\DiffMerge\ +rhapsody_diffmerge.regkeyalt=Software\Wow6432Node\Telelogic\Rhapsody\DiffMerge\  rhapsody_diffmerge.regname=Install Path  rhapsody_diffmerge.priority=-110  rhapsody_diffmerge.args=-xmerge $other $local -base $base -out $output