dmitry@294: # Some default global settings for common merge tools dmitry@294: dmitry@294: [merge-tools] dmitry@294: kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output dmitry@294: kdiff3.regkey=Software\KDiff3 dmitry@294: kdiff3.regappend=\kdiff3.exe dmitry@294: kdiff3.fixeol=True dmitry@294: kdiff3.gui=True dmitry@294: dmitry@294: gvimdiff.args=--nofork -d -g -O $local $other $base dmitry@294: gvimdiff.regkey=Software\Vim\GVim dmitry@294: gvimdiff.regname=path dmitry@294: gvimdiff.priority=-9 dmitry@294: dmitry@294: merge.checkconflicts=True dmitry@294: merge.priority=-10 dmitry@294: dmitry@294: gpyfm.gui=True dmitry@294: dmitry@294: meld.gui=True dmitry@294: meld.args=--label='local' $local --label='base' $base --label='other' $other dmitry@294: dmitry@294: tkdiff.args=$local $other -a $base -o $output dmitry@294: tkdiff.gui=True dmitry@294: tkdiff.priority=-8 dmitry@294: dmitry@294: xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other dmitry@294: xxdiff.gui=True dmitry@294: xxdiff.priority=-8 dmitry@294: dmitry@294: diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\ dmitry@294: diffmerge.regname=Location dmitry@294: diffmerge.priority=-7 dmitry@294: diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output dmitry@294: diffmerge.checkchanged=True dmitry@294: diffmerge.gui=True dmitry@294: dmitry@294: p4merge.args=$base $local $other $output dmitry@294: p4merge.regkey=Software\Perforce\Environment dmitry@294: p4merge.regname=P4INSTROOT dmitry@294: p4merge.regappend=\p4merge.exe dmitry@294: p4merge.gui=True dmitry@294: p4merge.priority=-8 dmitry@294: dmitry@294: tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output dmitry@294: tortoisemerge.regkey=Software\TortoiseSVN dmitry@294: tortoisemerge.checkchanged=True dmitry@294: tortoisemerge.gui=True dmitry@294: tortoisemerge.priority=-8 dmitry@294: dmitry@294: ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output dmitry@294: ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge dmitry@294: ecmerge.gui=True dmitry@294: dmitry@294: filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge dmitry@294: filemerge.args=-left $other -right $local -ancestor $base -merge $output dmitry@294: filemerge.gui=True dmitry@294: dmitry@294: ; Windows version of Beyond Compare dmitry@294: beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo dmitry@294: beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 dmitry@294: beyondcompare3.regname=ExePath dmitry@294: beyondcompare3.gui=True dmitry@294: beyondcompare3.priority=-2 dmitry@294: dmitry@294: ; Linux version of Beyond Compare dmitry@294: bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo dmitry@294: bcompare.premerge=False dmitry@294: bcompare.gui=True dmitry@294: bcompare.priority=-1 dmitry@294: dmitry@294: winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output dmitry@294: winmerge.regkey=Software\Thingamahoochie\WinMerge dmitry@294: winmerge.regname=Executable dmitry@294: winmerge.checkchanged=True dmitry@294: winmerge.gui=True dmitry@294: winmerge.priority=-10 dmitry@294: dmitry@294: araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR dmitry@294: araxis.regappend=\ConsoleCompare.exe dmitry@294: araxis.priority=-2 dmitry@294: araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output dmitry@294: araxis.premerge=False dmitry@294: araxis.checkconflict=True dmitry@294: araxis.binary=True dmitry@294: araxis.gui=True