Show More
@@ -1,103 +1,112 b'' | |||||
1 | # Some default global settings for common merge tools |
|
1 | # Some default global settings for common merge tools | |
2 |
|
2 | |||
3 | [merge-tools] |
|
3 | [merge-tools] | |
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 | kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child | |
10 |
|
10 | |||
11 | gvimdiff.args=--nofork -d -g -O $local $other $base |
|
11 | gvimdiff.args=--nofork -d -g -O $local $other $base | |
12 | gvimdiff.regkey=Software\Vim\GVim |
|
12 | gvimdiff.regkey=Software\Vim\GVim | |
13 | gvimdiff.regname=path |
|
13 | gvimdiff.regname=path | |
14 | gvimdiff.priority=-9 |
|
14 | gvimdiff.priority=-9 | |
15 |
|
15 | |||
16 | merge.checkconflicts=True |
|
16 | merge.checkconflicts=True | |
17 | merge.priority=-100 |
|
17 | merge.priority=-100 | |
18 |
|
18 | |||
19 | gpyfm.gui=True |
|
19 | gpyfm.gui=True | |
20 |
|
20 | |||
21 | meld.gui=True |
|
21 | meld.gui=True | |
22 | 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 |
|
23 | meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child | |
24 |
|
24 | |||
25 | tkdiff.args=$local $other -a $base -o $output |
|
25 | tkdiff.args=$local $other -a $base -o $output | |
26 | tkdiff.gui=True |
|
26 | tkdiff.gui=True | |
27 | tkdiff.priority=-8 |
|
27 | tkdiff.priority=-8 | |
28 | tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $child |
|
28 | tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $child | |
29 |
|
29 | |||
30 | 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 | |
31 | xxdiff.gui=True |
|
31 | xxdiff.gui=True | |
32 | xxdiff.priority=-8 |
|
32 | xxdiff.priority=-8 | |
33 | xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child |
|
33 | xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child | |
34 |
|
34 | |||
35 | diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\ |
|
35 | diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\ | |
36 | diffmerge.regname=Location |
|
36 | diffmerge.regname=Location | |
37 | diffmerge.priority=-7 |
|
37 | diffmerge.priority=-7 | |
38 | 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 | |
39 | diffmerge.checkchanged=True |
|
39 | diffmerge.checkchanged=True | |
40 | diffmerge.gui=True |
|
40 | diffmerge.gui=True | |
41 | diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $child |
|
41 | diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $child | |
42 |
|
42 | |||
43 | p4merge.args=$base $local $other $output |
|
43 | p4merge.args=$base $local $other $output | |
44 | p4merge.regkey=Software\Perforce\Environment |
|
44 | p4merge.regkey=Software\Perforce\Environment | |
45 | p4merge.regname=P4INSTROOT |
|
45 | p4merge.regname=P4INSTROOT | |
46 | p4merge.regappend=\p4merge.exe |
|
46 | p4merge.regappend=\p4merge.exe | |
47 | p4merge.gui=True |
|
47 | p4merge.gui=True | |
48 | p4merge.priority=-8 |
|
48 | p4merge.priority=-8 | |
49 | p4merge.diffargs=$parent $child |
|
49 | p4merge.diffargs=$parent $child | |
50 |
|
50 | |||
51 | tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output |
|
51 | tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output | |
52 | tortoisemerge.regkey=Software\TortoiseSVN |
|
52 | tortoisemerge.regkey=Software\TortoiseSVN | |
53 | tortoisemerge.checkchanged=True |
|
53 | tortoisemerge.checkchanged=True | |
54 | tortoisemerge.gui=True |
|
54 | tortoisemerge.gui=True | |
55 | tortoisemerge.priority=-8 |
|
55 | tortoisemerge.priority=-8 | |
56 | tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel' |
|
56 | tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel' | |
57 |
|
57 | |||
58 | 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 | |
59 | ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge |
|
59 | ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge | |
60 | ecmerge.gui=True |
|
60 | ecmerge.gui=True | |
61 | ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel' |
|
61 | ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel' | |
62 |
|
62 | |||
63 | filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge |
|
63 | filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge | |
64 | filemerge.args=-left $other -right $local -ancestor $base -merge $output |
|
64 | filemerge.args=-left $other -right $local -ancestor $base -merge $output | |
65 | filemerge.gui=True |
|
65 | filemerge.gui=True | |
66 |
|
66 | |||
67 | ; Windows version of Beyond Compare |
|
67 | ; Windows version of Beyond Compare | |
68 | 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 | |
69 | beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 |
|
69 | beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 | |
70 | beyondcompare3.regname=ExePath |
|
70 | beyondcompare3.regname=ExePath | |
71 | beyondcompare3.gui=True |
|
71 | beyondcompare3.gui=True | |
72 | beyondcompare3.priority=-2 |
|
72 | beyondcompare3.priority=-2 | |
73 | beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child |
|
73 | beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child | |
74 |
|
74 | |||
75 | ; Linux version of Beyond Compare |
|
75 | ; Linux version of Beyond Compare | |
76 | 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 | |
77 | bcompare.premerge=False |
|
77 | bcompare.premerge=False | |
78 | bcompare.gui=True |
|
78 | bcompare.gui=True | |
79 | bcompare.priority=-1 |
|
79 | bcompare.priority=-1 | |
80 | bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child |
|
80 | bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child | |
81 |
|
81 | |||
82 | 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 | |
83 | winmerge.regkey=Software\Thingamahoochie\WinMerge |
|
83 | winmerge.regkey=Software\Thingamahoochie\WinMerge | |
84 | winmerge.regname=Executable |
|
84 | winmerge.regname=Executable | |
85 | winmerge.checkchanged=True |
|
85 | winmerge.checkchanged=True | |
86 | winmerge.gui=True |
|
86 | winmerge.gui=True | |
87 | winmerge.priority=-10 |
|
87 | winmerge.priority=-10 | |
88 | winmerge.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel' $parent $child |
|
88 | winmerge.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel' $parent $child | |
89 |
|
89 | |||
90 | 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 | |
91 | araxis.regappend=\ConsoleCompare.exe |
|
91 | araxis.regappend=\ConsoleCompare.exe | |
92 | araxis.priority=-2 |
|
92 | araxis.priority=-2 | |
93 | 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 | |
94 | araxis.premerge=False |
|
94 | araxis.premerge=False | |
95 | araxis.checkconflict=True |
|
95 | araxis.checkconflict=True | |
96 | araxis.binary=True |
|
96 | araxis.binary=True | |
97 | araxis.gui=True |
|
97 | araxis.gui=True | |
98 | araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child |
|
98 | araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child | |
99 |
|
99 | |||
100 | diffuse.priority=-3 |
|
100 | diffuse.priority=-3 | |
101 | diffuse.args=$local $base $other |
|
101 | diffuse.args=$local $base $other | |
102 | diffuse.gui=True |
|
102 | diffuse.gui=True | |
103 | diffuse.diffargs=$parent $child |
|
103 | diffuse.diffargs=$parent $child | |
|
104 | ||||
|
105 | UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe | |||
|
106 | UltraCompare.args = $base $local $other -title1 base -title3 other | |||
|
107 | UltraCompare.priority = -2 | |||
|
108 | UltraCompare.gui = True | |||
|
109 | UltraCompare.binary = True | |||
|
110 | UltraCompare.checkconflicts = True | |||
|
111 | UltraCompare.checkchanged = True | |||
|
112 | UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1 |
General Comments 0
You need to be logged in to leave comments.
Login now