2008-02-04 04:29:05 +03:00
# Some default global settings for common merge tools
[merge-tools]
2008-04-17 02:26:37 +04:00
kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
2008-02-04 04:29:05 +03:00
kdiff3.regkey=Software\KDiff3
2008-02-04 07:27:53 +03:00
kdiff3.regappend=\kdiff3.exe
kdiff3.fixeol=True
2008-02-04 04:29:05 +03:00
kdiff3.gui=True
gvimdiff.args=--nofork -d -g -O $local $other $base
2008-02-04 18:53:10 +03:00
gvimdiff.regkey=Software\Vim\GVim
2008-02-04 04:29:05 +03:00
gvimdiff.regname=path
gvimdiff.priority=-9
merge.checkconflicts=True
merge.priority=-10
gpyfm.gui=True
meld.gui=True
tkdiff.args=$local $other -a $base -o $output
tkdiff.gui=True
tkdiff.priority=-8
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.priority=-8
diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other
2008-02-07 05:32:06 +03:00
diffmerge.checkchanged=True
2008-02-04 04:29:05 +03:00
diffmerge.gui=True
p4merge.args=$base $local $other $output
p4merge.regkey=Software\Perforce\Environment
p4merge.regname=P4INSTROOT
p4merge.regappend=\p4merge.exe
p4merge.gui=True
p4merge.priority=-8
2009-01-17 20:51:40 +03:00
tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
2008-02-04 04:29:05 +03:00
tortoisemerge.regkey=Software\TortoiseSVN
2009-01-17 20:51:40 +03:00
tortoisemerge.checkchanged=True
2008-02-04 04:29:05 +03:00
tortoisemerge.gui=True
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
2008-11-17 07:56:55 +03:00
filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
2008-02-04 04:29:05 +03:00
filemerge.args=-left $other -right $local -ancestor $base -merge $output
filemerge.gui=True
2009-01-17 20:51:40 +03:00
2009-03-23 12:48:45 +03:00
beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
2009-01-24 01:39:28 +03:00
beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
beyondcompare3.regname=ExePath
2009-01-17 20:51:40 +03:00
beyondcompare3.gui=True
winmerge.args=/e /u /dl local /dr other /wr $local $other $output
winmerge.regkey=Software\Thingamahoochie\WinMerge
winmerge.regname=Executable
winmerge.checkchanged=True
winmerge.gui=True