hg_config_merge-tools

merge-tools.kdiff3.regkeyalt=Software\Wow6432Node\KDiff3
merge-tools.gvimdiff.args=--nofork -d -g -O $local $other $base
merge-tools.gvimdiff.regkey=Software\Vim\GVim
merge-tools.gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim
merge-tools.gvimdiff.regname=path
merge-tools.gvimdiff.priority=-9
merge-tools.gvimdiff.diffargs=--nofork -d -g -O $parent $child
merge-tools.vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"'
merge-tools.vimdiff.check=changed
merge-tools.vimdiff.priority=-10
merge-tools.merge.check=conflicts
merge-tools.merge.priority=-100
merge-tools.gpyfm.gui=True
merge-tools.meld.gui=True
merge-tools.meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $output
merge-tools.meld.check=changed
merge-tools.meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child
merge-tools.tkdiff.args=$local $other -a $base -o $output
merge-tools.tkdiff.gui=True
merge-tools.tkdiff.priority=-8
merge-tools.tkdiff.diffargs=-L $plabel1 $parent -L $clabel $child
merge-tools.xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other
merge-tools.xxdiff.gui=True
merge-tools.xxdiff.priority=-8
merge-tools.xxdiff.diffargs=--title1 $plabel1 $parent --title2 $clabel $child
merge-tools.diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
merge-tools.diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\
merge-tools.diffmerge.regname=Location
merge-tools.diffmerge.priority=-7
merge-tools.diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output
merge-tools.diffmerge.check=changed
merge-tools.diffmerge.gui=True
merge-tools.diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child
merge-tools.p4merge.args=$base $local $other $output
merge-tools.p4merge.regkey=Software\Perforce\Environment
merge-tools.p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment
merge-tools.p4merge.regname=P4INSTROOT
merge-tools.p4merge.regappend=\p4merge.exe
merge-tools.p4merge.gui=True
merge-tools.p4merge.priority=-8
merge-tools.p4merge.diffargs=$parent $child
merge-tools.p4mergeosx.executable=/Applications/p4merge.app/Contents/MacOS/p4merge
merge-tools.p4mergeosx.args=$base $local $other $output
merge-tools.p4mergeosx.gui=True
merge-tools.p4mergeosx.priority=-8
merge-tools.p4mergeosx.diffargs=$parent $child
merge-tools.tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
merge-tools.tortoisemerge.regkey=Software\TortoiseSVN
merge-tools.tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN
merge-tools.tortoisemerge.check=changed
merge-tools.tortoisemerge.gui=True
merge-tools.tortoisemerge.priority=-8
merge-tools.tortoisemerge.diffargs=/base:$parent /mine:$child /basename:$plabel1 /minename:$clabel
merge-tools.ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
merge-tools.ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
merge-tools.ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge
merge-tools.ecmerge.gui=True
merge-tools.ecmerge.diffargs=$parent $child --mode=diff2 --title1=$plabel1 --title2=$clabel
merge-tools.editmerge.args=$output
merge-tools.editmerge.check=changed
merge-tools.editmerge.premerge=keep
merge-tools.filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
merge-tools.filemerge.args=-left $other -right $local -ancestor $base -merge $output
merge-tools.filemerge.gui=True
merge-tools.filemergexcode.executable=/Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge
merge-tools.filemergexcode.args=-left $other -right $local -ancestor $base -merge $output
merge-tools.filemergexcode.gui=True
merge-tools.beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
merge-tools.beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
merge-tools.beyondcompare3.regname=ExePath
merge-tools.beyondcompare3.gui=True
merge-tools.beyondcompare3.priority=-2
merge-tools.beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child
merge-tools.bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
merge-tools.bcompare.gui=True
merge-tools.bcompare.priority=-1
merge-tools.bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child
merge-tools.bcomposx.executable=/Applications/Beyond Compare.app/Contents/MacOS/bcomp
merge-tools.bcomposx.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
merge-tools.bcomposx.gui=True
merge-tools.bcomposx.priority=-1
merge-tools.bcomposx.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child
merge-tools.winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output
merge-tools.winmerge.regkey=Software\Thingamahoochie\WinMerge
merge-tools.winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\
merge-tools.winmerge.regname=Executable
merge-tools.winmerge.check=changed
merge-tools.winmerge.gui=True
merge-tools.winmerge.priority=-10
merge-tools.winmerge.diffargs=/r /e /x /ub /wl /dl $plabel1 /dr $clabel $parent $child
merge-tools.araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR
merge-tools.araxis.regappend=\ConsoleCompare.exe
merge-tools.araxis.priority=-2
merge-tools.araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output
merge-tools.araxis.checkconflict=True
merge-tools.araxis.binary=True
merge-tools.araxis.gui=True
merge-tools.araxis.diffargs=/2 /wait /title1:$plabel1 /title2:$clabel $parent $child
merge-tools.diffuse.priority=-3
merge-tools.diffuse.args=$local $base $other
merge-tools.diffuse.gui=True
merge-tools.diffuse.diffargs=$parent $child
merge-tools.UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
merge-tools.UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
merge-tools.UltraCompare.args=$base $local $other -title1 base -title3 other
merge-tools.UltraCompare.priority=-2
merge-tools.UltraCompare.gui=True
merge-tools.UltraCompare.binary=True
merge-tools.UltraCompare.check=conflicts,changed
merge-tools.UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1
merge-tools.kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
merge-tools.kdiff3.regkey=Software\KDiff3
merge-tools.kdiff3.regappend=\kdiff3.exe
merge-tools.kdiff3.fixeol=True
merge-tools.kdiff3.gui=True
merge-tools.kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child