Show More
@@ -1,135 +1,135 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.regkeyalt=Software\Wow6432Node\KDiff3 |
|
6 | kdiff3.regkeyalt=Software\Wow6432Node\KDiff3 | |
7 | kdiff3.regappend=\kdiff3.exe |
|
7 | kdiff3.regappend=\kdiff3.exe | |
8 | kdiff3.fixeol=True |
|
8 | kdiff3.fixeol=True | |
9 | kdiff3.gui=True |
|
9 | kdiff3.gui=True | |
10 |
kdiff3.diffargs=--L1 |
|
10 | kdiff3.diffargs=--L1 $plabel1 --L2 $clabel $parent $child | |
11 |
|
11 | |||
12 | gvimdiff.args=--nofork -d -g -O $local $other $base |
|
12 | gvimdiff.args=--nofork -d -g -O $local $other $base | |
13 | gvimdiff.regkey=Software\Vim\GVim |
|
13 | gvimdiff.regkey=Software\Vim\GVim | |
14 | gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim |
|
14 | gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim | |
15 | gvimdiff.regname=path |
|
15 | gvimdiff.regname=path | |
16 | gvimdiff.priority=-9 |
|
16 | gvimdiff.priority=-9 | |
17 | gvimdiff.diffargs=--nofork -d -g -O $parent $child |
|
17 | gvimdiff.diffargs=--nofork -d -g -O $parent $child | |
18 |
|
18 | |||
19 | vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"' |
|
19 | vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"' | |
20 | vimdiff.check=changed |
|
20 | vimdiff.check=changed | |
21 | vimdiff.priority=-10 |
|
21 | vimdiff.priority=-10 | |
22 |
|
22 | |||
23 | merge.check=conflicts |
|
23 | merge.check=conflicts | |
24 | merge.priority=-100 |
|
24 | merge.priority=-100 | |
25 |
|
25 | |||
26 | gpyfm.gui=True |
|
26 | gpyfm.gui=True | |
27 |
|
27 | |||
28 | meld.gui=True |
|
28 | meld.gui=True | |
29 | meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $output |
|
29 | meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $output | |
30 | meld.check=changed |
|
30 | meld.check=changed | |
31 |
meld.diffargs=-a --label= |
|
31 | meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child | |
32 |
|
32 | |||
33 | tkdiff.args=$local $other -a $base -o $output |
|
33 | tkdiff.args=$local $other -a $base -o $output | |
34 | tkdiff.gui=True |
|
34 | tkdiff.gui=True | |
35 | tkdiff.priority=-8 |
|
35 | tkdiff.priority=-8 | |
36 |
tkdiff.diffargs=-L |
|
36 | tkdiff.diffargs=-L $plabel1 $parent -L $clabel $child | |
37 |
|
37 | |||
38 | xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other |
|
38 | xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other | |
39 | xxdiff.gui=True |
|
39 | xxdiff.gui=True | |
40 | xxdiff.priority=-8 |
|
40 | xxdiff.priority=-8 | |
41 |
xxdiff.diffargs=--title1 |
|
41 | xxdiff.diffargs=--title1 $plabel1 $parent --title2 $clabel $child | |
42 |
|
42 | |||
43 | diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\ |
|
43 | diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\ | |
44 | diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\ |
|
44 | diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\ | |
45 | diffmerge.regname=Location |
|
45 | diffmerge.regname=Location | |
46 | diffmerge.priority=-7 |
|
46 | diffmerge.priority=-7 | |
47 | diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output |
|
47 | diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output | |
48 | diffmerge.check=changed |
|
48 | diffmerge.check=changed | |
49 | diffmerge.gui=True |
|
49 | diffmerge.gui=True | |
50 |
diffmerge.diffargs=--nosplash --title1= |
|
50 | diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child | |
51 |
|
51 | |||
52 | p4merge.args=$base $local $other $output |
|
52 | p4merge.args=$base $local $other $output | |
53 | p4merge.regkey=Software\Perforce\Environment |
|
53 | p4merge.regkey=Software\Perforce\Environment | |
54 | p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment |
|
54 | p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment | |
55 | p4merge.regname=P4INSTROOT |
|
55 | p4merge.regname=P4INSTROOT | |
56 | p4merge.regappend=\p4merge.exe |
|
56 | p4merge.regappend=\p4merge.exe | |
57 | p4merge.gui=True |
|
57 | p4merge.gui=True | |
58 | p4merge.priority=-8 |
|
58 | p4merge.priority=-8 | |
59 | p4merge.diffargs=$parent $child |
|
59 | p4merge.diffargs=$parent $child | |
60 |
|
60 | |||
61 | p4mergeosx.executable = /Applications/p4merge.app/Contents/MacOS/p4merge |
|
61 | p4mergeosx.executable = /Applications/p4merge.app/Contents/MacOS/p4merge | |
62 | p4mergeosx.args = $base $local $other $output |
|
62 | p4mergeosx.args = $base $local $other $output | |
63 | p4mergeosx.gui = True |
|
63 | p4mergeosx.gui = True | |
64 | p4mergeosx.priority=-8 |
|
64 | p4mergeosx.priority=-8 | |
65 | p4mergeosx.diffargs=$parent $child |
|
65 | p4mergeosx.diffargs=$parent $child | |
66 |
|
66 | |||
67 | tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output |
|
67 | tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output | |
68 | tortoisemerge.regkey=Software\TortoiseSVN |
|
68 | tortoisemerge.regkey=Software\TortoiseSVN | |
69 | tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN |
|
69 | tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN | |
70 | tortoisemerge.check=changed |
|
70 | tortoisemerge.check=changed | |
71 | tortoisemerge.gui=True |
|
71 | tortoisemerge.gui=True | |
72 | tortoisemerge.priority=-8 |
|
72 | tortoisemerge.priority=-8 | |
73 |
tortoisemerge.diffargs=/base:$parent /mine:$child /basename: |
|
73 | tortoisemerge.diffargs=/base:$parent /mine:$child /basename:$plabel1 /minename:$clabel | |
74 |
|
74 | |||
75 | ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output |
|
75 | ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output | |
76 | ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge |
|
76 | ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge | |
77 | ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge |
|
77 | ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge | |
78 | ecmerge.gui=True |
|
78 | ecmerge.gui=True | |
79 |
ecmerge.diffargs=$parent $child --mode=diff2 --title1= |
|
79 | ecmerge.diffargs=$parent $child --mode=diff2 --title1=$plabel1 --title2=$clabel | |
80 |
|
80 | |||
81 | # editmerge is a small script shipped in contrib. |
|
81 | # editmerge is a small script shipped in contrib. | |
82 | # It needs this config otherwise it behaves the same as internal:local |
|
82 | # It needs this config otherwise it behaves the same as internal:local | |
83 | editmerge.args=$output |
|
83 | editmerge.args=$output | |
84 | editmerge.check=changed |
|
84 | editmerge.check=changed | |
85 | editmerge.premerge=keep |
|
85 | editmerge.premerge=keep | |
86 |
|
86 | |||
87 | filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge |
|
87 | filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge | |
88 | filemerge.args=-left $other -right $local -ancestor $base -merge $output |
|
88 | filemerge.args=-left $other -right $local -ancestor $base -merge $output | |
89 | filemerge.gui=True |
|
89 | filemerge.gui=True | |
90 |
|
90 | |||
91 | ; Windows version of Beyond Compare |
|
91 | ; Windows version of Beyond Compare | |
92 | beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo |
|
92 | beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo | |
93 | beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 |
|
93 | beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 | |
94 | beyondcompare3.regname=ExePath |
|
94 | beyondcompare3.regname=ExePath | |
95 | beyondcompare3.gui=True |
|
95 | beyondcompare3.gui=True | |
96 | beyondcompare3.priority=-2 |
|
96 | beyondcompare3.priority=-2 | |
97 |
beyondcompare3.diffargs=/lro /lefttitle= |
|
97 | beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child | |
98 |
|
98 | |||
99 | ; Linux version of Beyond Compare |
|
99 | ; Linux version of Beyond Compare | |
100 | bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo |
|
100 | bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo | |
101 | bcompare.gui=True |
|
101 | bcompare.gui=True | |
102 | bcompare.priority=-1 |
|
102 | bcompare.priority=-1 | |
103 |
bcompare.diffargs=-lro -lefttitle= |
|
103 | bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child | |
104 |
|
104 | |||
105 | winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output |
|
105 | winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output | |
106 | winmerge.regkey=Software\Thingamahoochie\WinMerge |
|
106 | winmerge.regkey=Software\Thingamahoochie\WinMerge | |
107 | winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\ |
|
107 | winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\ | |
108 | winmerge.regname=Executable |
|
108 | winmerge.regname=Executable | |
109 | winmerge.check=changed |
|
109 | winmerge.check=changed | |
110 | winmerge.gui=True |
|
110 | winmerge.gui=True | |
111 | winmerge.priority=-10 |
|
111 | winmerge.priority=-10 | |
112 |
winmerge.diffargs=/r /e /x /ub /wl /dl |
|
112 | winmerge.diffargs=/r /e /x /ub /wl /dl $plabel1 /dr $clabel $parent $child | |
113 |
|
113 | |||
114 | araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR |
|
114 | araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR | |
115 | araxis.regappend=\ConsoleCompare.exe |
|
115 | araxis.regappend=\ConsoleCompare.exe | |
116 | araxis.priority=-2 |
|
116 | araxis.priority=-2 | |
117 | araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output |
|
117 | araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output | |
118 | araxis.checkconflict=True |
|
118 | araxis.checkconflict=True | |
119 | araxis.binary=True |
|
119 | araxis.binary=True | |
120 | araxis.gui=True |
|
120 | araxis.gui=True | |
121 |
araxis.diffargs=/2 /wait /title1: |
|
121 | araxis.diffargs=/2 /wait /title1:$plabel1 /title2:$clabel $parent $child | |
122 |
|
122 | |||
123 | diffuse.priority=-3 |
|
123 | diffuse.priority=-3 | |
124 | diffuse.args=$local $base $other |
|
124 | diffuse.args=$local $base $other | |
125 | diffuse.gui=True |
|
125 | diffuse.gui=True | |
126 | diffuse.diffargs=$parent $child |
|
126 | diffuse.diffargs=$parent $child | |
127 |
|
127 | |||
128 | UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe |
|
128 | UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe | |
129 | UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe |
|
129 | UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe | |
130 | UltraCompare.args = $base $local $other -title1 base -title3 other |
|
130 | UltraCompare.args = $base $local $other -title1 base -title3 other | |
131 | UltraCompare.priority = -2 |
|
131 | UltraCompare.priority = -2 | |
132 | UltraCompare.gui = True |
|
132 | UltraCompare.gui = True | |
133 | UltraCompare.binary = True |
|
133 | UltraCompare.binary = True | |
134 | UltraCompare.check = conflicts,changed |
|
134 | UltraCompare.check = conflicts,changed | |
135 | UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1 |
|
135 | UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1 |
General Comments 0
You need to be logged in to leave comments.
Login now