##// END OF EJS Templates
Update win32 merge tools configuration...
Pascal Quantin -
r7665:950484f0 default
parent child Browse files
Show More
@@ -1,51 +1,62 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.regappend=\kdiff3.exe
6 kdiff3.regappend=\kdiff3.exe
7 kdiff3.fixeol=True
7 kdiff3.fixeol=True
8 kdiff3.gui=True
8 kdiff3.gui=True
9
9
10 gvimdiff.args=--nofork -d -g -O $local $other $base
10 gvimdiff.args=--nofork -d -g -O $local $other $base
11 gvimdiff.regkey=Software\Vim\GVim
11 gvimdiff.regkey=Software\Vim\GVim
12 gvimdiff.regname=path
12 gvimdiff.regname=path
13 gvimdiff.priority=-9
13 gvimdiff.priority=-9
14
14
15 merge.checkconflicts=True
15 merge.checkconflicts=True
16 merge.priority=-10
16 merge.priority=-10
17
17
18 gpyfm.gui=True
18 gpyfm.gui=True
19
19
20 meld.gui=True
20 meld.gui=True
21
21
22 tkdiff.args=$local $other -a $base -o $output
22 tkdiff.args=$local $other -a $base -o $output
23 tkdiff.gui=True
23 tkdiff.gui=True
24 tkdiff.priority=-8
24 tkdiff.priority=-8
25
25
26 xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other
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
27 xxdiff.gui=True
28 xxdiff.priority=-8
28 xxdiff.priority=-8
29
29
30 diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other
30 diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other
31 diffmerge.checkchanged=True
31 diffmerge.checkchanged=True
32 diffmerge.gui=True
32 diffmerge.gui=True
33
33
34 p4merge.args=$base $local $other $output
34 p4merge.args=$base $local $other $output
35 p4merge.regkey=Software\Perforce\Environment
35 p4merge.regkey=Software\Perforce\Environment
36 p4merge.regname=P4INSTROOT
36 p4merge.regname=P4INSTROOT
37 p4merge.regappend=\p4merge.exe
37 p4merge.regappend=\p4merge.exe
38 p4merge.gui=True
38 p4merge.gui=True
39 p4merge.priority=-8
39 p4merge.priority=-8
40
40
41 tortoisemerge.args=/base: $output /mine:$local /theirs:$other /merged:$output
41 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
42 tortoisemerge.regkey=Software\TortoiseSVN
42 tortoisemerge.regkey=Software\TortoiseSVN
43 tortoisemerge.checkchanged=True
43 tortoisemerge.gui=True
44 tortoisemerge.gui=True
44
45
45 ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
46 ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
46 ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
47 ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
47 ecmerge.gui=True
48 ecmerge.gui=True
48
49
49 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
50 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
50 filemerge.args=-left $other -right $local -ancestor $base -merge $output
51 filemerge.args=-left $other -right $local -ancestor $base -merge $output
51 filemerge.gui=True
52 filemerge.gui=True
53
54 beyondcompare3.executable=C:\Program Files\Beyond Compare 3\BComp.exe
55 beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts
56 beyondcompare3.gui=True
57
58 winmerge.args=/e /u /dl local /dr other /wr $local $other $output
59 winmerge.regkey=Software\Thingamahoochie\WinMerge
60 winmerge.regname=Executable
61 winmerge.checkchanged=True
62 winmerge.gui=True
General Comments 0
You need to be logged in to leave comments. Login now