mergetools.hgrc
123 lines
| 4.8 KiB
| text/plain
|
TextLexer
/ contrib / mergetools.hgrc
|
r6008 | # Some default global settings for common merge tools | ||
[merge-tools] | ||||
|
r6559 | kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output | ||
|
r6008 | kdiff3.regkey=Software\KDiff3 | ||
|
r13566 | kdiff3.regkeyalt=Software\Wow6432Node\KDiff3 | ||
|
r6011 | kdiff3.regappend=\kdiff3.exe | ||
kdiff3.fixeol=True | ||||
|
r6008 | kdiff3.gui=True | ||
|
r11184 | kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child | ||
|
r6008 | |||
gvimdiff.args=--nofork -d -g -O $local $other $base | ||||
|
r6014 | gvimdiff.regkey=Software\Vim\GVim | ||
|
r13566 | gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim | ||
|
r6008 | gvimdiff.regname=path | ||
gvimdiff.priority=-9 | ||||
|
r11506 | vimdiff.args=$local $other $base | ||
|
r17422 | vimdiff.check=changed | ||
|
r11506 | vimdiff.priority=-10 | ||
|
r18385 | merge.check=conflicts | ||
|
r11147 | merge.priority=-100 | ||
|
r6008 | |||
gpyfm.gui=True | ||||
meld.gui=True | ||||
|
r10486 | meld.args=--label='local' $local --label='base' $base --label='other' $other | ||
|
r11184 | meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child | ||
|
r6008 | |||
tkdiff.args=$local $other -a $base -o $output | ||||
tkdiff.gui=True | ||||
tkdiff.priority=-8 | ||||
|
r11184 | tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $child | ||
|
r6008 | |||
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 | ||||
|
r11184 | xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child | ||
|
r6008 | |||
|
r10486 | diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\ | ||
|
r13566 | diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\ | ||
|
r10486 | diffmerge.regname=Location | ||
diffmerge.priority=-7 | ||||
diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output | ||||
|
r18385 | diffmerge.check=changed | ||
|
r6008 | diffmerge.gui=True | ||
|
r11184 | diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $child | ||
|
r6008 | |||
p4merge.args=$base $local $other $output | ||||
p4merge.regkey=Software\Perforce\Environment | ||||
|
r13566 | p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment | ||
|
r6008 | p4merge.regname=P4INSTROOT | ||
p4merge.regappend=\p4merge.exe | ||||
p4merge.gui=True | ||||
p4merge.priority=-8 | ||||
|
r11184 | p4merge.diffargs=$parent $child | ||
|
r6008 | |||
|
r7665 | tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output | ||
|
r6008 | tortoisemerge.regkey=Software\TortoiseSVN | ||
|
r13566 | tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN | ||
|
r18385 | tortoisemerge.check=changed | ||
|
r6008 | tortoisemerge.gui=True | ||
|
r10486 | tortoisemerge.priority=-8 | ||
|
r11184 | tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel' | ||
|
r6008 | |||
ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output | ||||
ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge | ||||
|
r13566 | ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge | ||
|
r6008 | ecmerge.gui=True | ||
|
r11184 | ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel' | ||
|
r6008 | |||
|
r7385 | filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge | ||
|
r6008 | filemerge.args=-left $other -right $local -ancestor $base -merge $output | ||
filemerge.gui=True | ||||
|
r7665 | |||
|
r10486 | ; Windows version of Beyond Compare | ||
|
r7867 | beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo | ||
|
r7683 | beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 | ||
beyondcompare3.regname=ExePath | ||||
|
r7665 | beyondcompare3.gui=True | ||
|
r10486 | beyondcompare3.priority=-2 | ||
|
r11184 | beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child | ||
|
r7665 | |||
|
r10486 | ; 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.premerge=False | ||||
bcompare.gui=True | ||||
bcompare.priority=-1 | ||||
|
r11184 | bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child | ||
|
r10486 | |||
winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output | ||||
|
r7665 | winmerge.regkey=Software\Thingamahoochie\WinMerge | ||
|
r13566 | winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\ | ||
|
r7665 | winmerge.regname=Executable | ||
|
r18385 | winmerge.check=changed | ||
|
r7665 | winmerge.gui=True | ||
|
r10486 | winmerge.priority=-10 | ||
|
r11184 | winmerge.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel' $parent $child | ||
|
r10486 | |||
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.premerge=False | ||||
araxis.checkconflict=True | ||||
araxis.binary=True | ||||
araxis.gui=True | ||||
|
r11184 | araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child | ||
diffuse.priority=-3 | ||||
diffuse.args=$local $base $other | ||||
diffuse.gui=True | ||||
diffuse.diffargs=$parent $child | ||||
|
r11308 | |||
UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe | ||||
|
r13566 | UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe | ||
|
r11308 | UltraCompare.args = $base $local $other -title1 base -title3 other | ||
UltraCompare.priority = -2 | ||||
UltraCompare.gui = True | ||||
UltraCompare.binary = True | ||||
|
r18385 | UltraCompare.check = conflicts,changed | ||
|
r11308 | UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1 | ||