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

stable mergetools: add Telelogic Rhapsody DifMerge

Contributed by Didly Bom

Changeset 11b4666ec382…

Parent 175c25f10f4f…

by Steve Borho

Changes to 2 files · Browse files at 11b4666ec382 Showing diff from parent 175c25f10f4f Diff from another changeset...

Change 1 of 1 Show Changes Only contrib/​mergetools.rc Stacked
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
 [merge-tools]  ; Windows version of BeyondCompare 3  beyondcompare3.priority=-1  beyondcompare3.args=$local $other $base /mergeoutput=$output /ro /lefttitle=parent1 /centertitle=base /righttitle=parent2 /outputtitle=merged /automerge /reviewconflicts /solo  beyondcompare3.premerge=False  beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3  beyondcompare3.regname=ExePath  beyondcompare3.gui=True  beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child  beyondcompare3.diff3args=$parent1 $parent2 $child /lefttitle='$plabel1' /centertitle='$clabel' /righttitle='$plabel2' /solo /ro  beyondcompare3.dirdiff=True    ; Windows version of BeyondCompare 2 (2-way diff only)  beyondcompare2.priority=-4  beyondcompare2.args= /ro /title1="Original" /title2="Working copy" $local $other  beyondcompare2.regkey=Software\Scooter Software\Beyond Compare  beyondcompare2.regname=ExePath  beyondcompare2.gui=True  beyondcompare2.diffargs=/lro /title1='$plabel1' /title2='$clabel' $parent $child  beyondcompare2.dirdiff=True    araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR  araxis.regappend=\ConsoleCompare.exe  ;araxis.executable=${ProgramFiles}/Araxis/Araxis Merge/ConsoleCompare.exe  araxis.priority=-2  araxis.args=/3 /a2 /wait /merge /title1:"Parent 1" /title2:"Merge Result: "$output /title3:"Parent 2" $local $base $other $output  araxis.premerge=False  araxis.checkconflict=True  araxis.binary=True  araxis.gui=True  araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child  araxis.diff3args=/3 /a2 /wait /title1:"$plabel1" /title2:"$clabel" /title3:"$plabel2" $parent1 $child $parent2  araxis.dirdiff=True  araxis.dir3diff=True    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  UltraCompare.diff3args=$parent1 $child $parent2 -title1 $plabel1 -title2 $clabel -title3 $plabel2    kdiff3.priority=-3  kdiff3.args=--auto --L1 base --L2 parent1 --L3 parent2 $base $local $other -o $output  kdiff3.regkey=Software\KDiff3  kdiff3.regappend=\kdiff3.exe  kdiff3.fixeol=False  kdiff3.premerge=False  kdiff3.gui=True  kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child  kdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2  kdiff3.dirdiff=True    thgKdiff3.regkey=Software\TortoiseHg  thgKdiff3.regappend=\kdiff3.exe  thgKdiff3.priority=-4  thgKdiff3.args=--auto --L1 base --L2 parent1 --L3 parent2 $base $local $other -o $output  thgKdiff3.fixeol=False  thgKdiff3.premerge=False  thgKdiff3.gui=True  thgKdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child  thgKdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2  thgKdiff3.dirdiff=True    diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\  diffmerge.regname=Location  diffmerge.priority=-7  diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output  diffmerge.checkchanged=True  diffmerge.gui=True  diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $child  diffmerge.diff3args=--nosplash --title1='$plabel1' --title2='$clabel' --title3='$plabel2' $parent1 $child $parent2  diffmerge.dirdiff=True    p4merge.priority=-8  p4merge.args=$base $local $other $output  p4merge.regkey=Software\Perforce\Environment  p4merge.regname=P4INSTROOT  p4merge.regappend=\p4merge.exe  p4merge.gui=True  p4merge.diffargs=$parent $child  p4merge.diff3args=$child $parent1 $parent2  p4merge.dirdiff=False    tortoisemerge.priority=-9  tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output  tortoisemerge.regkey=Software\TortoiseSVN  tortoisemerge.checkchanged=True  tortoisemerge.gui=True  tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel'  ; TortoiseMerge does not support three-way file or directory comparisons    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.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'  ecmerge.dirdiff=True  ecmerge.dir3diff=True    winmergeu.regkey=Software\Thingamahoochie\WinMerge\  winmergeu.regname=Executable  winmergeu.priority=-10  winmergeu.args=/e /x /wl /ub /dl other /dr local $other $local $output  winmergeu.fixeol=True  winmergeu.checkchanged=True  winmergeu.gui=True  winmergeu.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel' $parent $child  winmergeu.diff3args=  winmergeu.dirdiff=True    ; TortoiseHg diff wrapper for some binary documents, not for merge general use  docdiff.priority=-100  docdiff.regkey=Software\TortoiseHg  docdiff.regappend=\docdiff.exe  docdiff.args=$local $base $other $output  docdiff.gui=True  docdiff.diffargs=$child $parent  docdiff.diff3args=$parent1 $child $parent2 $child  ; These scripts fork processes, so the visual diff window must be used  docdiff.usewin=True    ; Windows only diff tools  rekisa.priority=-1  rekisa.args = -Title=Base "$base" -Title=Local "$local" -Title=Other "$other"  rekisa.gui = True  rekisa.diffargs = "-Title=$plabel1" "$parent" "-Title=$clabel" "$child"  rekisa.diff3args = "-Title=$plabel1" "$parent1" "-Title=$clabel" "$child" "-Title=$plabel2" "$parent2"  rekisa.dirdiff = False    ; Linux only diff tools, listed here for reference  bcompare.priority=-1  bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo  bcompare.premerge=False  bcompare.gui=True  bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child  bcompare.diff3args=$parent1 $parent2 $child -lefttitle='$plabel1' -centertitle='$clabel' -righttitle='$plabel2' -solo -expandall  bcompare.dirdiff=True    meld.gui=True  meld.args=--label='local' $local --label='base' $base --label='other' $other  meld.priority=-2  meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child  meld.diff3args=-a --label='$plabel1' $parent1 --label='$clabel' $child --label='$plabel2' $parent2  meld.dirdiff=True    diffuse.priority=-3  diffuse.args=$local $base $other  diffuse.gui=True  diffuse.diffargs=$parent $child  diffuse.diff3args=$parent1 $child $parent2  diffuse.dirdiff=False    xxdiff.priority=-4  xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other  xxdiff.gui=True  xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child  xxdiff.diff3args=--title1 '$plabel1' $parent1 --title2 '$clabel' $child --title3 '$plabel2' $parent2  xxdiff.dirdiff=True    tkdiff.args=-L local -L other $local $other -a $base -o $output  tkdiff.gui=True  tkdiff.priority=-5  tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $child  tkdiff.diff3args=  tkdiff.dirdiff=False + + +; Telelogic Rhapsody DiffMerge Tool +rhapsody_diffmerge.regkey=Software\Telelogic\Rhapsody\DiffMerge\ +rhapsody_diffmerge.regname=Install Path +rhapsody_diffmerge.priority=-110 +rhapsody_diffmerge.args=-xmerge $other $local -base $base -out $output +rhapsody_diffmerge.checkchanged=True +rhapsody_diffmerge.gui=True +rhapsody_diffmerge.diffargs=-xcompare $parent $child +rhapsody_diffmerge.diff3args=
Change 1 of 2 Show Entire File win32/​mergepatterns.rc Stacked
 
6
7
8
 
 
 
 
 
9
10
11
 
22
23
24
 
 
 
 
 
 
6
7
8
9
10
11
12
13
14
15
16
 
27
28
29
30
31
32
33
34
@@ -6,6 +6,11 @@
 **.odt = docdiff  **.sxw = docdiff   +# If you have Telelogic Rhapsody DifMerge, enable these +#**.sbs = rhapsody_diffmerge +#**.rpy = rhapsody_diffmerge +#**.cmp = rhapsody_diffmerge +  [diff-patterns]  **.doc = docdiff  **.docx = docdiff @@ -22,3 +27,8 @@
 **.odt = docdiff  **.sxw = docdiff  **.nb = docdiff + +# If you have Telelogic Rhapsody DifMerge, enable these +#*.sbs = rhapsody_diffmerge +#*.rpy = rhapsody_diffmerge +#*.cmp = rhapsody_diffmerge