| 4 |
- |
1 |
# Some default global settings for common merge tools
|
|
|
2 |
|
|
|
3 |
[merge-tools]
|
|
|
4 |
kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
|
|
|
5 |
kdiff3.regkey=Software\KDiff3
|
|
|
6 |
kdiff3.regappend=\kdiff3.exe
|
|
|
7 |
kdiff3.fixeol=True
|
|
|
8 |
kdiff3.gui=True
|
|
|
9 |
|
|
|
10 |
gvimdiff.args=--nofork -d -g -O $local $other $base
|
|
|
11 |
gvimdiff.regkey=Software\Vim\GVim
|
|
|
12 |
gvimdiff.regname=path
|
|
|
13 |
gvimdiff.priority=-9
|
|
|
14 |
|
|
|
15 |
merge.checkconflicts=True
|
|
|
16 |
merge.priority=-10
|
|
|
17 |
|
|
|
18 |
gpyfm.gui=True
|
|
|
19 |
|
|
|
20 |
meld.gui=True
|
|
|
21 |
|
|
|
22 |
tkdiff.args=$local $other -a $base -o $output
|
|
|
23 |
tkdiff.gui=True
|
|
|
24 |
tkdiff.priority=-8
|
|
|
25 |
|
|
|
26 |
xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other
|
|
|
27 |
xxdiff.gui=True
|
|
|
28 |
xxdiff.priority=-8
|
|
|
29 |
|
|
|
30 |
diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other
|
|
|
31 |
diffmerge.checkchanged=True
|
|
|
32 |
diffmerge.gui=True
|
|
|
33 |
|
|
|
34 |
p4merge.args=$base $local $other $output
|
|
|
35 |
p4merge.regkey=Software\Perforce\Environment
|
|
|
36 |
p4merge.regname=P4INSTROOT
|
|
|
37 |
p4merge.regappend=\p4merge.exe
|
|
|
38 |
p4merge.gui=True
|
|
|
39 |
p4merge.priority=-8
|
|
|
40 |
|
|
|
41 |
tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
|
|
|
42 |
tortoisemerge.regkey=Software\TortoiseSVN
|
|
|
43 |
tortoisemerge.checkchanged=True
|
|
|
44 |
tortoisemerge.gui=True
|
|
|
45 |
|
|
|
46 |
ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
|
|
|
47 |
ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
|
|
|
48 |
ecmerge.gui=True
|
|
|
49 |
|
|
|
50 |
filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
|
|
|
51 |
filemerge.args=-left $other -right $local -ancestor $base -merge $output
|
|
|
52 |
filemerge.gui=True
|
|
|
53 |
|
|
|
54 |
beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
|
|
|
55 |
beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
|
|
|
56 |
beyondcompare3.regname=ExePath
|
|
|
57 |
beyondcompare3.gui=True
|
|
|
58 |
|
|
|
59 |
winmerge.args=/e /u /dl local /dr other /wr $local $other $output
|
|
|
60 |
winmerge.regkey=Software\Thingamahoochie\WinMerge
|
|
|
61 |
winmerge.regname=Executable
|
|
|
62 |
winmerge.checkchanged=True
|
|
|
63 |
winmerge.gui=True
|