/contrib/mergetools.rc

  1[merge-tools]
  2; Windows version of BeyondCompare 3
  3beyondcompare3.priority=-1
  4beyondcompare3.args=$local $other $base /mergeoutput=$output /ro /lefttitle=parent1 /centertitle=base /righttitle=parent2 /outputtitle=merged /automerge /reviewconflicts /solo
  5beyondcompare3.premerge=False
  6beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
  7beyondcompare3.regname=ExePath
  8beyondcompare3.gui=True
  9beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child
 10beyondcompare3.diff3args=$parent1 $parent2 $child /lefttitle='$plabel1' /centertitle='$clabel' /righttitle='$plabel2' /solo /ro
 11beyondcompare3.dirdiff=True
 12
 13; Windows version of BeyondCompare 2 (2-way diff only)
 14beyondcompare2.priority=-4
 15beyondcompare2.args= /ro /title1="Original" /title2="Working copy" $local $other
 16beyondcompare2.regkey=Software\Scooter Software\Beyond Compare
 17beyondcompare2.regname=ExePath
 18beyondcompare2.gui=True
 19beyondcompare2.diffargs=/lro /title1='$plabel1' /title2='$clabel' $parent $child
 20beyondcompare2.dirdiff=True
 21
 22araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR
 23araxis.regappend=\ConsoleCompare.exe
 24;araxis.executable=${ProgramFiles}/Araxis/Araxis Merge/ConsoleCompare.exe
 25araxis.priority=-2
 26araxis.args=/3 /a2 /wait /merge /title1:"Parent 1" /title2:"Merge Result: "$output /title3:"Parent 2" $local $base $other $output
 27araxis.premerge=False
 28araxis.checkconflict=True
 29araxis.binary=True
 30araxis.gui=True
 31araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child
 32araxis.diff3args=/3 /a2 /wait /title1:"$plabel1" /title2:"$clabel" /title3:"$plabel2" $parent1 $child $parent2
 33araxis.dirdiff=True
 34araxis.dir3diff=True
 35
 36UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
 37UltraCompare.args = $base $local $other -title1 base -title3 other
 38UltraCompare.priority = -2
 39UltraCompare.gui = True
 40UltraCompare.binary = True
 41UltraCompare.checkconflicts = True
 42UltraCompare.checkchanged = True
 43UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1
 44UltraCompare.diff3args=$parent1 $child $parent2 -title1 $plabel1 -title2 $clabel -title3 $plabel2
 45
 46kdiff3.priority=-3
 47kdiff3.args=--auto --L1 base --L2 parent1 --L3 parent2 $base $local $other -o $output
 48kdiff3.regkey=Software\KDiff3
 49kdiff3.regappend=\kdiff3.exe
 50kdiff3.fixeol=False
 51kdiff3.premerge=False
 52kdiff3.gui=True
 53kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
 54kdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2
 55kdiff3.dirdiff=True
 56
 57thgKdiff3.regkey=Software\TortoiseHg
 58thgKdiff3.regappend=\kdiff3.exe
 59thgKdiff3.priority=-4
 60thgKdiff3.args=--auto --L1 base --L2 parent1 --L3 parent2 $base $local $other -o $output
 61thgKdiff3.fixeol=False
 62thgKdiff3.premerge=False
 63thgKdiff3.gui=True
 64thgKdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
 65thgKdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2
 66thgKdiff3.dirdiff=True
 67
 68diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
 69diffmerge.regname=Location
 70diffmerge.priority=-7
 71diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output
 72diffmerge.checkchanged=True
 73diffmerge.gui=True
 74diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $child
 75diffmerge.diff3args=--nosplash --title1='$plabel1' --title2='$clabel' --title3='$plabel2' $parent1 $child $parent2
 76diffmerge.dirdiff=True
 77
 78p4merge.priority=-8
 79p4merge.args=$base $local $other $output
 80p4merge.regkey=Software\Perforce\Environment
 81p4merge.regname=P4INSTROOT
 82p4merge.regappend=\p4merge.exe
 83p4merge.gui=True
 84p4merge.diffargs=$parent $child
 85p4merge.diff3args=$child $parent1 $parent2
 86p4merge.dirdiff=False
 87
 88tortoisemerge.priority=-9
 89tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
 90tortoisemerge.regkey=Software\TortoiseSVN
 91tortoisemerge.checkchanged=True
 92tortoisemerge.gui=True
 93tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel'
 94; TortoiseMerge does not support three-way file or directory comparisons
 95
 96ecmerge.priority=-10
 97ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
 98ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
 99ecmerge.gui=True
100ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel'
101ecmerge.diff3args=$child $parent1 $parent2 --mode=diff3 --title0='$clabel' --title1='$plabel1' --title2='$plabel2'
102ecmerge.dirdiff=True
103ecmerge.dir3diff=True
104
105winmergeu.regkey=Software\Thingamahoochie\WinMerge\
106winmergeu.regname=Executable
107winmergeu.priority=-10
108winmergeu.args=/e /x /wl /ub /dl other /dr local $other $local $output
109winmergeu.fixeol=True
110winmergeu.checkchanged=True
111winmergeu.gui=True
112winmergeu.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel' $parent $child
113winmergeu.diff3args=
114winmergeu.dirdiff=True
115
116; TortoiseHg diff wrapper for some binary documents, not for merge general use
117docdiff.priority=-100
118docdiff.regkey=Software\TortoiseHg
119docdiff.regappend=\docdiff.exe
120docdiff.args=$local $base $other $output
121docdiff.gui=True
122docdiff.diffargs=$child $parent
123docdiff.diff3args=$parent1 $child $parent2 $child
124; These scripts fork processes, so the visual diff window must be used
125docdiff.usewin=True
126
127; Windows only diff tools
128rekisa.priority=-1
129rekisa.args = -Title=Base "$base" -Title=Local "$local" -Title=Other "$other"
130rekisa.gui = True
131rekisa.diffargs = "-Title=$plabel1" "$parent" "-Title=$clabel" "$child"
132rekisa.diff3args = "-Title=$plabel1" "$parent1" "-Title=$clabel" "$child" "-Title=$plabel2" "$parent2"
133rekisa.dirdiff = False
134
135; Linux only diff tools, listed here for reference
136bcompare.priority=-1
137bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
138bcompare.premerge=False
139bcompare.gui=True
140bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child
141bcompare.diff3args=$parent1 $parent2 $child -lefttitle='$plabel1' -centertitle='$clabel' -righttitle='$plabel2' -solo -expandall
142bcompare.dirdiff=True
143
144meld.gui=True
145meld.args=--label='local' $local --label='base' $base --label='other' $other
146meld.priority=-2
147meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child
148meld.diff3args=-a --label='$plabel1' $parent1 --label='$clabel' $child --label='$plabel2' $parent2
149meld.dirdiff=True
150
151diffuse.priority=-3
152diffuse.args=$local $base $other
153diffuse.gui=True
154diffuse.diffargs=$parent $child
155diffuse.diff3args=$parent1 $child $parent2
156diffuse.dirdiff=False
157
158xxdiff.priority=-4
159xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other
160xxdiff.gui=True
161xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child
162xxdiff.diff3args=--title1 '$plabel1' $parent1 --title2 '$clabel' $child --title3 '$plabel2' $parent2
163xxdiff.dirdiff=True
164
165tkdiff.args=-L local -L other $local $other -a $base -o $output
166tkdiff.gui=True
167tkdiff.priority=-5
168tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $child
169tkdiff.diff3args=
170tkdiff.dirdiff=False