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