Show More
@@ -0,0 +1,48 b'' | |||||
|
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.append=\kdiff3.exe | |||
|
7 | kdiff3.gui=True | |||
|
8 | ||||
|
9 | gvimdiff.args=--nofork -d -g -O $local $other $base | |||
|
10 | gvimdiff.regkey=Software\Vin\GVim | |||
|
11 | gvimdiff.regname=path | |||
|
12 | gvimdiff.priority=-9 | |||
|
13 | ||||
|
14 | merge.checkconflicts=True | |||
|
15 | merge.priority=-10 | |||
|
16 | ||||
|
17 | gpyfm.gui=True | |||
|
18 | ||||
|
19 | meld.gui=True | |||
|
20 | ||||
|
21 | tkdiff.args=$local $other -a $base -o $output | |||
|
22 | tkdiff.gui=True | |||
|
23 | tkdiff.priority=-8 | |||
|
24 | ||||
|
25 | xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other | |||
|
26 | xxdiff.gui=True | |||
|
27 | xxdiff.priority=-8 | |||
|
28 | ||||
|
29 | diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other | |||
|
30 | diffmerge.gui=True | |||
|
31 | ||||
|
32 | p4merge.args=$base $local $other $output | |||
|
33 | p4merge.regkey=Software\Perforce\Environment | |||
|
34 | p4merge.regname=P4INSTROOT | |||
|
35 | p4merge.regappend=\p4merge.exe | |||
|
36 | p4merge.gui=True | |||
|
37 | p4merge.priority=-8 | |||
|
38 | ||||
|
39 | tortoisemerge.args=/base: $output /mine:$local /theirs:$other /merged:$output | |||
|
40 | tortoisemerge.regkey=Software\TortoiseSVN | |||
|
41 | tortoisemerge.gui=True | |||
|
42 | ||||
|
43 | ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output | |||
|
44 | ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge | |||
|
45 | ecmerge.gui=True | |||
|
46 | ||||
|
47 | filemerge.args=-left $other -right $local -ancestor $base -merge $output | |||
|
48 | filemerge.gui=True |
General Comments 0
You need to be logged in to leave comments.
Login now