Commits

Anonymous committed e202131

mergetools: add support for Devart Code Compare and Code Compare 3 (Free and Pro)

Comments (0)

Files changed (1)

contrib/mergetools.rc

 rekisa.diff3args = "-Title=$plabel1" "$parent1" "-Title=$clabel" "$child" "-Title=$plabel2" "$parent2"
 rekisa.dirdiff = False
 
+; 2-way diff only version of Code Compare
+codecompare_diff.regkey=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\CodeCompare_is1
+codecompare_diff.regname=InstallLocation
+codecompare_diff.regappend=CodeCompare.exe
+codecompare_diff.diffargs=/SC=TortoiseHg /title1="$plabel1" /title2="$clabel" $parent $child
+codecompare_diff.diff3args=/SC=TortoiseHg /title1="$plabel1" /title2="$clabel" /title3="$plabel2" $parent1 $child $parent2
+codecompare_diff.binary=False
+codecompare_diff.gui=True
+codecompare_diff.dirdiff=True
+
+; 3-way merge version of Code Compare (not for diff, just for merge, Pro version only)
+codecompare_merge.regkey=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\CodeCompare_is1
+codecompare_merge.regname=InstallLocation
+codecompare_merge.regappend=CodeMerge.exe
+codecompare_merge.args=/SC=TortoiseHg /TF=$other /MF=$local /RF=$output /BF=$base /TT="Other: $other" /MT="Local: $local" /RT="Output: $output" /BT="Base: $base"
+codecompare_merge.binary=False
+codecompare_merge.gui=True
+codecompare_merge.checkconflicts=True
+
 ; 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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.