Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

stable mergetools: add 'Rekisa' as Windows diff tool

Changeset 1f549e69c2f2…

Parent 7591f00c58d6…

by Yuki KODAMA

Changes to one file · Browse files at 1f549e69c2f2 Showing diff from parent 7591f00c58d6 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​mergetools.ini Stacked
 
97
98
99
 
 
 
 
 
 
 
 
100
101
102
 
97
98
99
100
101
102
103
104
105
106
107
108
109
110
@@ -97,6 +97,14 @@
 ; 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