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 Entire File contrib/​mergetools.rc Stacked
 
168
169
170
 
 
 
 
 
 
 
 
 
 
 
 
168
169
170
171
172
173
174
175
176
177
178
179
180
181
@@ -168,3 +168,14 @@
 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