4 kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output |
4 kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output |
5 kdiff3.regkey=Software\KDiff3 |
5 kdiff3.regkey=Software\KDiff3 |
6 kdiff3.regappend=\kdiff3.exe |
6 kdiff3.regappend=\kdiff3.exe |
7 kdiff3.fixeol=True |
7 kdiff3.fixeol=True |
8 kdiff3.gui=True |
8 kdiff3.gui=True |
|
9 kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child |
9 |
10 |
10 gvimdiff.args=--nofork -d -g -O $local $other $base |
11 gvimdiff.args=--nofork -d -g -O $local $other $base |
11 gvimdiff.regkey=Software\Vim\GVim |
12 gvimdiff.regkey=Software\Vim\GVim |
12 gvimdiff.regname=path |
13 gvimdiff.regname=path |
13 gvimdiff.priority=-9 |
14 gvimdiff.priority=-9 |
17 |
18 |
18 gpyfm.gui=True |
19 gpyfm.gui=True |
19 |
20 |
20 meld.gui=True |
21 meld.gui=True |
21 meld.args=--label='local' $local --label='base' $base --label='other' $other |
22 meld.args=--label='local' $local --label='base' $base --label='other' $other |
|
23 meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child |
22 |
24 |
23 tkdiff.args=$local $other -a $base -o $output |
25 tkdiff.args=$local $other -a $base -o $output |
24 tkdiff.gui=True |
26 tkdiff.gui=True |
25 tkdiff.priority=-8 |
27 tkdiff.priority=-8 |
|
28 tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $child |
26 |
29 |
27 xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other |
30 xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other |
28 xxdiff.gui=True |
31 xxdiff.gui=True |
29 xxdiff.priority=-8 |
32 xxdiff.priority=-8 |
|
33 xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child |
30 |
34 |
31 diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\ |
35 diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\ |
32 diffmerge.regname=Location |
36 diffmerge.regname=Location |
33 diffmerge.priority=-7 |
37 diffmerge.priority=-7 |
34 diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output |
38 diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output |
35 diffmerge.checkchanged=True |
39 diffmerge.checkchanged=True |
36 diffmerge.gui=True |
40 diffmerge.gui=True |
|
41 diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $child |
37 |
42 |
38 p4merge.args=$base $local $other $output |
43 p4merge.args=$base $local $other $output |
39 p4merge.regkey=Software\Perforce\Environment |
44 p4merge.regkey=Software\Perforce\Environment |
40 p4merge.regname=P4INSTROOT |
45 p4merge.regname=P4INSTROOT |
41 p4merge.regappend=\p4merge.exe |
46 p4merge.regappend=\p4merge.exe |
42 p4merge.gui=True |
47 p4merge.gui=True |
43 p4merge.priority=-8 |
48 p4merge.priority=-8 |
|
49 p4merge.diffargs=$parent $child |
44 |
50 |
45 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output |
51 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output |
46 tortoisemerge.regkey=Software\TortoiseSVN |
52 tortoisemerge.regkey=Software\TortoiseSVN |
47 tortoisemerge.checkchanged=True |
53 tortoisemerge.checkchanged=True |
48 tortoisemerge.gui=True |
54 tortoisemerge.gui=True |
49 tortoisemerge.priority=-8 |
55 tortoisemerge.priority=-8 |
|
56 tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel' |
50 |
57 |
51 ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output |
58 ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output |
52 ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge |
59 ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge |
53 ecmerge.gui=True |
60 ecmerge.gui=True |
|
61 ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel' |
54 |
62 |
55 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge |
63 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge |
56 filemerge.args=-left $other -right $local -ancestor $base -merge $output |
64 filemerge.args=-left $other -right $local -ancestor $base -merge $output |
57 filemerge.gui=True |
65 filemerge.gui=True |
58 |
66 |
60 beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo |
68 beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo |
61 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 |
69 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 |
62 beyondcompare3.regname=ExePath |
70 beyondcompare3.regname=ExePath |
63 beyondcompare3.gui=True |
71 beyondcompare3.gui=True |
64 beyondcompare3.priority=-2 |
72 beyondcompare3.priority=-2 |
|
73 beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child |
65 |
74 |
66 ; Linux version of Beyond Compare |
75 ; Linux version of Beyond Compare |
67 bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo |
76 bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo |
68 bcompare.premerge=False |
77 bcompare.premerge=False |
69 bcompare.gui=True |
78 bcompare.gui=True |
70 bcompare.priority=-1 |
79 bcompare.priority=-1 |
|
80 bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child |
71 |
81 |
72 winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output |
82 winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output |
73 winmerge.regkey=Software\Thingamahoochie\WinMerge |
83 winmerge.regkey=Software\Thingamahoochie\WinMerge |
74 winmerge.regname=Executable |
84 winmerge.regname=Executable |
75 winmerge.checkchanged=True |
85 winmerge.checkchanged=True |
76 winmerge.gui=True |
86 winmerge.gui=True |
77 winmerge.priority=-10 |
87 winmerge.priority=-10 |
|
88 winmerge.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel' $parent $child |
78 |
89 |
79 araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR |
90 araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR |
80 araxis.regappend=\ConsoleCompare.exe |
91 araxis.regappend=\ConsoleCompare.exe |
81 araxis.priority=-2 |
92 araxis.priority=-2 |
82 araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output |
93 araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output |
83 araxis.premerge=False |
94 araxis.premerge=False |
84 araxis.checkconflict=True |
95 araxis.checkconflict=True |
85 araxis.binary=True |
96 araxis.binary=True |
86 araxis.gui=True |
97 araxis.gui=True |
|
98 araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child |
|
99 |
|
100 diffuse.priority=-3 |
|
101 diffuse.args=$local $base $other |
|
102 diffuse.gui=True |
|
103 diffuse.diffargs=$parent $child |