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