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
2011-03-08 22:35:01 +03:00
kdiff3.regkeyalt=Software\Wow6432Node\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
2015-01-28 04:28:38 +03:00
kdiff3.diffargs=--L1 $plabel1 --L2 $clabel $parent $child
2008-02-04 04:29:05 +03:00
gvimdiff.args=--nofork -d -g -O $local $other $base
2008-02-04 18:53:10 +03:00
gvimdiff.regkey=Software\Vim\GVim
2011-03-08 22:35:01 +03:00
gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim
2008-02-04 04:29:05 +03:00
gvimdiff.regname=path
gvimdiff.priority=-9
2014-07-12 15:07:24 +04:00
gvimdiff.diffargs=--nofork -d -g -O $parent $child
2008-02-04 04:29:05 +03:00
2013-02-16 01:06:43 +04:00
vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"'
2012-08-02 15:51:49 +04:00
vimdiff.check=changed
2010-07-03 04:15:25 +04:00
vimdiff.priority=-10
2013-01-16 02:30:10 +04:00
merge.check=conflicts
2010-04-21 21:02:51 +04:00
merge.priority=-100
2008-02-04 04:29:05 +03:00
gpyfm.gui=True
meld.gui=True
2013-04-16 15:55:38 +04:00
meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $output
2013-02-21 17:49:25 +04:00
meld.check=changed
2015-01-28 04:28:38 +03:00
meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child
2008-02-04 04:29:05 +03:00
tkdiff.args=$local $other -a $base -o $output
tkdiff.gui=True
tkdiff.priority=-8
2015-01-28 04:28:38 +03:00
tkdiff.diffargs=-L $plabel1 $parent -L $clabel $child
2008-02-04 04:29:05 +03:00
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
2015-01-28 04:28:38 +03:00
xxdiff.diffargs=--title1 $plabel1 $parent --title2 $clabel $child
2008-02-04 04:29:05 +03:00
2010-02-16 06:18:16 +03:00
diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
2011-03-08 22:35:01 +03:00
diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\
2010-02-16 06:18:16 +03:00
diffmerge.regname=Location
diffmerge.priority=-7
diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output
2013-01-16 02:30:10 +04:00
diffmerge.check=changed
2008-02-04 04:29:05 +03:00
diffmerge.gui=True
2015-01-28 04:28:38 +03:00
diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child
2008-02-04 04:29:05 +03:00
p4merge.args=$base $local $other $output
p4merge.regkey=Software\Perforce\Environment
2011-03-08 22:35:01 +03:00
p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment
2008-02-04 04:29:05 +03:00
p4merge.regname=P4INSTROOT
p4merge.regappend=\p4merge.exe
p4merge.gui=True
p4merge.priority=-8
2010-01-08 07:19:05 +03:00
p4merge.diffargs=$parent $child
2008-02-04 04:29:05 +03:00
2014-08-27 18:39:44 +04:00
p4mergeosx.executable = /Applications/p4merge.app/Contents/MacOS/p4merge
p4mergeosx.args = $base $local $other $output
p4mergeosx.gui = True
p4mergeosx.priority=-8
p4mergeosx.diffargs=$parent $child
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
2011-03-08 22:35:01 +03:00
tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN
2013-01-16 02:30:10 +04:00
tortoisemerge.check=changed
2008-02-04 04:29:05 +03:00
tortoisemerge.gui=True
2010-02-16 06:18:16 +03:00
tortoisemerge.priority=-8
2015-01-28 04:28:38 +03:00
tortoisemerge.diffargs=/base:$parent /mine:$child /basename:$plabel1 /minename:$clabel
2008-02-04 04:29:05 +03:00
ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
2011-03-08 22:35:01 +03:00
ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge
2008-02-04 04:29:05 +03:00
ecmerge.gui=True
2015-01-28 04:28:38 +03:00
ecmerge.diffargs=$parent $child --mode=diff2 --title1=$plabel1 --title2=$clabel
2008-02-04 04:29:05 +03:00
2014-05-29 23:25:25 +04:00
# editmerge is a small script shipped in contrib.
# It needs this config otherwise it behaves the same as internal:local
editmerge.args=$output
editmerge.check=changed
editmerge.premerge=keep
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
2010-02-16 06:18:16 +03:00
; Windows version of Beyond Compare
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
2010-02-16 06:18:16 +03:00
beyondcompare3.priority=-2
2015-01-28 04:28:38 +03:00
beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child
2009-01-17 20:51:40 +03:00
2010-02-16 06:18:16 +03:00
; Linux version of Beyond Compare
bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
bcompare.gui=True
bcompare.priority=-1
2015-01-28 04:28:38 +03:00
bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child
2010-02-16 06:18:16 +03:00
2015-02-27 23:42:58 +03:00
; OS X version of Beyond Compare
bcomposx.executable = /Applications/Beyond Compare.app/Contents/MacOS/bcomp
bcomposx.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
bcomposx.gui=True
bcomposx.priority=-1
bcomposx.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child
2010-02-16 06:18:16 +03:00
winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output
2009-01-17 20:51:40 +03:00
winmerge.regkey=Software\Thingamahoochie\WinMerge
2011-03-08 22:35:01 +03:00
winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\
2009-01-17 20:51:40 +03:00
winmerge.regname=Executable
2013-01-16 02:30:10 +04:00
winmerge.check=changed
2009-01-17 20:51:40 +03:00
winmerge.gui=True
2010-02-16 06:18:16 +03:00
winmerge.priority=-10
2015-01-28 04:28:38 +03:00
winmerge.diffargs=/r /e /x /ub /wl /dl $plabel1 /dr $clabel $parent $child
2010-02-16 06:18:16 +03:00
araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR
araxis.regappend=\ConsoleCompare.exe
araxis.priority=-2
araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output
araxis.checkconflict=True
araxis.binary=True
araxis.gui=True
2015-01-28 04:28:38 +03:00
araxis.diffargs=/2 /wait /title1:$plabel1 /title2:$clabel $parent $child
2010-01-08 07:19:05 +03:00
diffuse.priority=-3
diffuse.args=$local $base $other
diffuse.gui=True
diffuse.diffargs=$parent $child
2010-06-08 20:58:09 +04:00
UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
2011-03-08 22:35:01 +03:00
UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
2010-06-08 20:58:09 +04:00
UltraCompare.args = $base $local $other -title1 base -title3 other
UltraCompare.priority = -2
UltraCompare.gui = True
UltraCompare.binary = True
2013-01-16 02:30:10 +04:00
UltraCompare.check = conflicts,changed
2010-06-08 20:58:09 +04:00
UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1