##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

mergetools: alphabetize the config settings...
Matt Harbison -
r46740:ceaf1646 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,82 +1,55 b''
1 1 # Some default global settings for common merge tools
2 2
3 3 [merge-tools]
4 kdiff3.args=--auto --L1 $labelbase --L2 $labellocal --L3 $labelother $base $local $other -o $output
5 kdiff3.regkey=Software\KDiff3
6 kdiff3.regkeyalt=Software\Wow6432Node\KDiff3
7 kdiff3.regappend=\kdiff3.exe
8 kdiff3.fixeol=True
9 kdiff3.gui=True
10 kdiff3.diffargs=--L1 $plabel1 --L2 $clabel $parent $child
4 araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output
5 araxis.binary=True
6 araxis.checkconflict=True
7 araxis.diffargs=/2 /wait /title1:$plabel1 /title2:$clabel $parent $child
8 araxis.gui=True
9 araxis.priority=-2
10 araxis.regappend=\ConsoleCompare.exe
11 araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR
11 12
12 gvimdiff.args=--nofork -d -g -O $local $other $base
13 gvimdiff.regkey=Software\Vim\GVim
14 gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim
15 gvimdiff.regname=path
16 gvimdiff.priority=-9
17 gvimdiff.diffargs=--nofork -d -g -O $parent $child
18
19 vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"'
20 vimdiff.check=changed
21 vimdiff.priority=-10
13 ; Linux version of Beyond Compare
14 bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=$labellocal -centertitle=$labelbase -righttitle=$labelother -outputtitle=merged -automerge -reviewconflicts -solo
15 bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child
16 bcompare.gui=True
17 bcompare.priority=-1
22 18
23 merge.check=conflicts
24 merge.priority=-100
25
26 gpyfm.gui=True
27
28 meld.gui=True
29 meld.args=--label=$labellocal $local --label='merged' $base --label=$labelother $other -o $output --auto-merge
30 meld.check=changed
31 meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child
19 ; OS X version of Beyond Compare
20 bcomposx.args=$local $other $base -mergeoutput=$output -ro -lefttitle=$labellocal -centertitle=$labelbase -righttitle=$labelother -outputtitle=merged -automerge -reviewconflicts -solo
21 bcomposx.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child
22 bcomposx.executable = /Applications/Beyond Compare.app/Contents/MacOS/bcomp
23 bcomposx.gui=True
24 bcomposx.priority=-1
32 25
33 tkdiff.args=$local $other -a $base -o $output
34 tkdiff.gui=True
35 tkdiff.priority=-8
36 tkdiff.diffargs=-L $plabel1 $parent -L $clabel $child
26 ; Windows version of Beyond Compare
27 beyondcompare3.args=$local $other $base $output /ro /lefttitle=$labellocal /centertitle=$labelbase /righttitle=$labelother /automerge /reviewconflicts /solo
28 beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child
29 beyondcompare3.gui=True
30 beyondcompare3.priority=-2
31 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
32 beyondcompare3.regname=ExePath
37 33
38 xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 $labellocal --title2 $labelbase --title3 $labelother --merged-filename $output --merge $local $base $other
39 xxdiff.gui=True
40 xxdiff.priority=-8
41 xxdiff.diffargs=--title1 $plabel1 $parent --title2 $clabel $child
42
34 diffmerge.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output
35 diffmerge.check=changed
36 diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child
37 diffmerge.gui=True
38 diffmerge.priority=-7
43 39 diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
44 40 diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\
45 41 diffmerge.regname=Location
46 diffmerge.priority=-7
47 diffmerge.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output
48 diffmerge.check=changed
49 diffmerge.gui=True
50 diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child
51 42
52 p4merge.args=$base $local $other $output
53 p4merge.regkey=Software\Perforce\Environment
54 p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment
55 p4merge.regname=P4INSTROOT
56 p4merge.regappend=\p4merge.exe
57 p4merge.gui=True
58 p4merge.priority=-8
59 p4merge.diffargs=$parent $child
60
61 p4mergeosx.executable = /Applications/p4merge.app/Contents/MacOS/p4merge
62 p4mergeosx.args = $base $local $other $output
63 p4mergeosx.gui = True
64 p4mergeosx.priority=-8
65 p4mergeosx.diffargs=$parent $child
66
67 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
68 tortoisemerge.regkey=Software\TortoiseSVN
69 tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN
70 tortoisemerge.check=changed
71 tortoisemerge.gui=True
72 tortoisemerge.priority=-8
73 tortoisemerge.diffargs=/base:$parent /mine:$child /basename:$plabel1 /minename:$clabel
43 diffuse.args=$local $base $other
44 diffuse.diffargs=$parent $child
45 diffuse.gui=True
46 diffuse.priority=-3
74 47
75 48 ecmerge.args=$base $local $other --mode=merge3 --title0=$labelbase --title1=$labellocal --title2=$labelother --to=$output
49 ecmerge.diffargs=$parent $child --mode=diff2 --title1=$plabel1 --title2=$clabel
50 ecmerge.gui=True
76 51 ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
77 52 ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge
78 ecmerge.gui=True
79 ecmerge.diffargs=$parent $child --mode=diff2 --title1=$plabel1 --title2=$clabel
80 53
81 54 # editmerge is a small script shipped in contrib.
82 55 # It needs this config otherwise it behaves the same as internal:local
@@ -84,63 +57,89 b' editmerge.args=$output'
84 57 editmerge.check=changed
85 58 editmerge.premerge=keep
86 59
60 filemerge.args=-left $other -right $local -ancestor $base -merge $output
87 61 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
88 filemerge.args=-left $other -right $local -ancestor $base -merge $output
89 62 filemerge.gui=True
90 63
64 filemergexcode.args=-left $other -right $local -ancestor $base -merge $output
91 65 filemergexcode.executable=/Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge
92 filemergexcode.args=-left $other -right $local -ancestor $base -merge $output
93 66 filemergexcode.gui=True
94 67
95 ; Windows version of Beyond Compare
96 beyondcompare3.args=$local $other $base $output /ro /lefttitle=$labellocal /centertitle=$labelbase /righttitle=$labelother /automerge /reviewconflicts /solo
97 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
98 beyondcompare3.regname=ExePath
99 beyondcompare3.gui=True
100 beyondcompare3.priority=-2
101 beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child
68 gpyfm.gui=True
69
70 gvimdiff.args=--nofork -d -g -O $local $other $base
71 gvimdiff.diffargs=--nofork -d -g -O $parent $child
72 gvimdiff.priority=-9
73 gvimdiff.regkey=Software\Vim\GVim
74 gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim
75 gvimdiff.regname=path
76
77 kdiff3.args=--auto --L1 $labelbase --L2 $labellocal --L3 $labelother $base $local $other -o $output
78 kdiff3.diffargs=--L1 $plabel1 --L2 $clabel $parent $child
79 kdiff3.fixeol=True
80 kdiff3.gui=True
81 kdiff3.regappend=\kdiff3.exe
82 kdiff3.regkey=Software\KDiff3
83 kdiff3.regkeyalt=Software\Wow6432Node\KDiff3
84
85 meld.args=--label=$labellocal $local --label='merged' $base --label=$labelother $other -o $output --auto-merge
86 meld.check=changed
87 meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child
88 meld.gui=True
89
90 merge.check=conflicts
91 merge.priority=-100
92
93 p4merge.args=$base $local $other $output
94 p4merge.diffargs=$parent $child
95 p4merge.gui=True
96 p4merge.priority=-8
97 p4merge.regappend=\p4merge.exe
98 p4merge.regkey=Software\Perforce\Environment
99 p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment
100 p4merge.regname=P4INSTROOT
102 101
103 ; Linux version of Beyond Compare
104 bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=$labellocal -centertitle=$labelbase -righttitle=$labelother -outputtitle=merged -automerge -reviewconflicts -solo
105 bcompare.gui=True
106 bcompare.priority=-1
107 bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child
102 p4mergeosx.args = $base $local $other $output
103 p4mergeosx.diffargs=$parent $child
104 p4mergeosx.executable = /Applications/p4merge.app/Contents/MacOS/p4merge
105 p4mergeosx.gui = True
106 p4mergeosx.priority=-8
107
108 tkdiff.args=$local $other -a $base -o $output
109 tkdiff.diffargs=-L $plabel1 $parent -L $clabel $child
110 tkdiff.gui=True
111 tkdiff.priority=-8
108 112
109 ; OS X version of Beyond Compare
110 bcomposx.executable = /Applications/Beyond Compare.app/Contents/MacOS/bcomp
111 bcomposx.args=$local $other $base -mergeoutput=$output -ro -lefttitle=$labellocal -centertitle=$labelbase -righttitle=$labelother -outputtitle=merged -automerge -reviewconflicts -solo
112 bcomposx.gui=True
113 bcomposx.priority=-1
114 bcomposx.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child
113 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
114 tortoisemerge.check=changed
115 tortoisemerge.diffargs=/base:$parent /mine:$child /basename:$plabel1 /minename:$clabel
116 tortoisemerge.gui=True
117 tortoisemerge.priority=-8
118 tortoisemerge.regkey=Software\TortoiseSVN
119 tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN
115 120
121 UltraCompare.args = $base $local $other -title1 base -title3 other
122 UltraCompare.binary = True
123 UltraCompare.check = conflicts,changed
124 UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1
125 UltraCompare.gui = True
126 UltraCompare.priority = -2
127 UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
128 UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
129
130 vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"'
131 vimdiff.check=changed
132 vimdiff.priority=-10
116 133 winmerge.args=/e /x /wl /ub /dl $labelother /dr $labellocal $other $local $output
134 winmerge.check=changed
135 winmerge.diffargs=/r /e /x /ub /wl /dl $plabel1 /dr $clabel $parent $child
136 winmerge.gui=True
137 winmerge.priority=-10
117 138 winmerge.regkey=Software\Thingamahoochie\WinMerge
118 139 winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\
119 140 winmerge.regname=Executable
120 winmerge.check=changed
121 winmerge.gui=True
122 winmerge.priority=-10
123 winmerge.diffargs=/r /e /x /ub /wl /dl $plabel1 /dr $clabel $parent $child
124 141
125 araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR
126 araxis.regappend=\ConsoleCompare.exe
127 araxis.priority=-2
128 araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output
129 araxis.checkconflict=True
130 araxis.binary=True
131 araxis.gui=True
132 araxis.diffargs=/2 /wait /title1:$plabel1 /title2:$clabel $parent $child
133
134 diffuse.priority=-3
135 diffuse.args=$local $base $other
136 diffuse.gui=True
137 diffuse.diffargs=$parent $child
138
139 UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
140 UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
141 UltraCompare.args = $base $local $other -title1 base -title3 other
142 UltraCompare.priority = -2
143 UltraCompare.gui = True
144 UltraCompare.binary = True
145 UltraCompare.check = conflicts,changed
146 UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1
142 xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 $labellocal --title2 $labelbase --title3 $labelother --merged-filename $output --merge $local $base $other
143 xxdiff.diffargs=--title1 $plabel1 $parent --title2 $clabel $child
144 xxdiff.gui=True
145 xxdiff.priority=-8
General Comments 0
You need to be logged in to leave comments. Login now