Show More
@@ -3,6 +3,7 b'' | |||||
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.regkeyalt=Software\Wow6432Node\KDiff3 | |||
6 | kdiff3.regappend=\kdiff3.exe |
|
7 | kdiff3.regappend=\kdiff3.exe | |
7 | kdiff3.fixeol=True |
|
8 | kdiff3.fixeol=True | |
8 | kdiff3.gui=True |
|
9 | kdiff3.gui=True | |
@@ -10,6 +11,7 b" kdiff3.diffargs=--L1 '$plabel1' --L2 '$c" | |||||
10 |
|
11 | |||
11 | gvimdiff.args=--nofork -d -g -O $local $other $base |
|
12 | gvimdiff.args=--nofork -d -g -O $local $other $base | |
12 | gvimdiff.regkey=Software\Vim\GVim |
|
13 | gvimdiff.regkey=Software\Vim\GVim | |
|
14 | gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim | |||
13 | gvimdiff.regname=path |
|
15 | gvimdiff.regname=path | |
14 | gvimdiff.priority=-9 |
|
16 | gvimdiff.priority=-9 | |
15 |
|
17 | |||
@@ -36,6 +38,7 b' xxdiff.priority=-8' | |||||
36 | xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child |
|
38 | xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child | |
37 |
|
39 | |||
38 | diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\ |
|
40 | diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\ | |
|
41 | diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\ | |||
39 | diffmerge.regname=Location |
|
42 | diffmerge.regname=Location | |
40 | diffmerge.priority=-7 |
|
43 | diffmerge.priority=-7 | |
41 | diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output |
|
44 | diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output | |
@@ -45,6 +48,7 b" diffmerge.diffargs=--nosplash --title1='" | |||||
45 |
|
48 | |||
46 | p4merge.args=$base $local $other $output |
|
49 | p4merge.args=$base $local $other $output | |
47 | p4merge.regkey=Software\Perforce\Environment |
|
50 | p4merge.regkey=Software\Perforce\Environment | |
|
51 | p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment | |||
48 | p4merge.regname=P4INSTROOT |
|
52 | p4merge.regname=P4INSTROOT | |
49 | p4merge.regappend=\p4merge.exe |
|
53 | p4merge.regappend=\p4merge.exe | |
50 | p4merge.gui=True |
|
54 | p4merge.gui=True | |
@@ -53,6 +57,7 b' p4merge.diffargs=$parent $child' | |||||
53 |
|
57 | |||
54 | tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output |
|
58 | tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output | |
55 | tortoisemerge.regkey=Software\TortoiseSVN |
|
59 | tortoisemerge.regkey=Software\TortoiseSVN | |
|
60 | tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN | |||
56 | tortoisemerge.checkchanged=True |
|
61 | tortoisemerge.checkchanged=True | |
57 | tortoisemerge.gui=True |
|
62 | tortoisemerge.gui=True | |
58 | tortoisemerge.priority=-8 |
|
63 | tortoisemerge.priority=-8 | |
@@ -60,6 +65,7 b' tortoisemerge.diffargs=/base:$parent /mi' | |||||
60 |
|
65 | |||
61 | ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output |
|
66 | ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output | |
62 | ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge |
|
67 | ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge | |
|
68 | ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge | |||
63 | ecmerge.gui=True |
|
69 | ecmerge.gui=True | |
64 | ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel' |
|
70 | ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel' | |
65 |
|
71 | |||
@@ -84,6 +90,7 b" bcompare.diffargs=-lro -lefttitle='$plab" | |||||
84 |
|
90 | |||
85 | winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output |
|
91 | winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output | |
86 | winmerge.regkey=Software\Thingamahoochie\WinMerge |
|
92 | winmerge.regkey=Software\Thingamahoochie\WinMerge | |
|
93 | winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\ | |||
87 | winmerge.regname=Executable |
|
94 | winmerge.regname=Executable | |
88 | winmerge.checkchanged=True |
|
95 | winmerge.checkchanged=True | |
89 | winmerge.gui=True |
|
96 | winmerge.gui=True | |
@@ -106,6 +113,7 b' diffuse.gui=True' | |||||
106 | diffuse.diffargs=$parent $child |
|
113 | diffuse.diffargs=$parent $child | |
107 |
|
114 | |||
108 | UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe |
|
115 | UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe | |
|
116 | UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe | |||
109 | UltraCompare.args = $base $local $other -title1 base -title3 other |
|
117 | UltraCompare.args = $base $local $other -title1 base -title3 other | |
110 | UltraCompare.priority = -2 |
|
118 | UltraCompare.priority = -2 | |
111 | UltraCompare.gui = True |
|
119 | UltraCompare.gui = True |
General Comments 0
You need to be logged in to leave comments.
Login now