Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

ini: add BC3 example to extdiff section

Changeset 0dcbf45782dc…

Parent e74e93dae385…

by Steve Borho

Changes to one file · Browse files at 0dcbf45782dc Showing diff from parent e74e93dae385 Diff from another changeset...

Change 1 of 1 Show Changes Only contrib/​win32/​mercurial.ini Stacked
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
 
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
 ; System-wide Mercurial config file.    ;  ; !!! Do Not Edit This File !!!  ;  ; This file is intended to be replaced by the installer on every upgrade.  ; Editing this file can cause strange side effects on Vista.  ;  ; http://bitbucket.org/tortoisehg/stable/issue/135  ;  ; To change settings you see in this file, override (or enable) them in  ; your user Mercurial.ini file. See the hgrc man page for details.  ;    [ui]  ; editor used to enter commit logs, etc. Most any text editor  ; will suffice.  editor = notepad    ; In order to push/pull over ssh you must specify a ssh tool  ssh = "{app}\TortoisePlink.exe" -ssh -2  ;ssh = C:\cygwin\bin\ssh    [merge-tools]  kdiff3.priority=-1  kdiff3.args=-L1 base --L2 local --L3 other $base $local $other -o $output  kdiff3.regkey=Software\KDiff3  kdiff3.regappend=\kdiff3.exe  kdiff3.fixeol=True  kdiff3.gui=True  beyondcompare3.priority=-2  beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo  beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3  beyondcompare3.regname=ExePath  beyondcompare3.gui=True  diffmerge.priority=-7  diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other  diffmerge.checkchanged=True  diffmerge.gui=True  p4merge.priority=-8  p4merge.args=$base $local $other $output  p4merge.regkey=Software\Perforce\Environment  p4merge.regname=P4INSTROOT  p4merge.regappend=\p4merge.exe  p4merge.gui=True  tortoisemerge.priority=-9  tortoisemerge.args=/base:$output /mine:$local /theirs:$other /merged:$output  tortoisemerge.regkey=Software\TortoiseSVN  tortoisemerge.gui=True  winmergeu.regkey=Software\Thingamahoochie\WinMerge\  winmergeu.regname=Executable  winmergeu.priority=-10  winmergeu.args=/e /ub /dl other /dr local $other $local $output  winmergeu.fixeol=True  winmergeu.gui=True    ;  ; For more information about mercurial extensions, start here  ; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions  ;    [extensions]  ; extensions shipped with Mercurial by default  ;  ;acl =  ;alias =  ;bookmarks =  ;bugzilla =  ;children =  ;churn =  ; Warning: the color extension is not recommended for Windows  ;color =  ;convert =  extdiff =  ;fetch =  ;gpg =  ;graphlog =  ;hgcia =  ;hgk =  ;highlight =  ;interhg =  ;keyword =  ;mq =  ;notify =  ;pager =  ;parentrevspec =  ;patchbomb =  ;purge =  ;rebase =  ;record =  ;transplant =  ;win32mbcs =  ;win32text =  ;zeroconf =    ; To use cleverencode/cleverdecode, you must enable win32text extension  ;  ; By default, we try to encode and decode all files that do not  ; contain ASCII NUL characters. What this means is that we try to set  ; line endings to Windows style on update, and to Unix style on  ; commit. This lets us cooperate with Linux and Unix users, so  ; everybody sees files with their native line endings.    [encode]  ; Encode files that don't contain NUL characters.    ; ** = cleverencode:    ; Alternatively, you can explicitly specify each file extension that  ; you want encoded (any you omit will be left untouched), like this:    ; *.txt = dumbencode:      [decode]  ; Decode files that don't contain NUL characters.    ; ** = cleverdecode:    ; Alternatively, you can explicitly specify each file extension that  ; you want decoded (any you omit will be left untouched), like this:    ; **.txt = dumbdecode:      ;  ; Define external diff commands  ;  [extdiff]  cmd.vdiff = {app}\kdiff3 +;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe  ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe  ;cmd.vimdiff = gvim.exe  ;opts.vimdiff = -f '+next' '+execute "DirDiff ".argv(0)." ".argv(1)'    [qct]  ;See http://bitbucket.org/tortoisehg/stable/wiki/FAQ for details  ;path="C:\Program Files\qct\qct.exe"    [hgk]  ;See http://bitbucket.org/tortoisehg/stable/wiki/FAQ for details  ;path={app}\scripts\hgk.cmd  ;vdiff=vdiff    ;  ; The git extended diff format will properly store binary files,  ; file permission changes, and rename information that the normal  ; patch format cannot cover. However it is also not 100% compatible  ; with tools which expect normal patches. so enable these at your  ; own risk.  ;  [diff]  ;git = false  ;nodates = false    ;  ; Some optional defaults  ;  [defaults]  ;view = --limit 100  ;log = --limit 100  ;revert = --no-backup  ;log = --style=changelog    ;  ; Keyword extension example configuration. To use, one must  ; enable the keyword extension, then uncomment and modify these  ; two sections. Before using the keyword extension, be sure to  ; thoroughly read it's documentation and understand how it works,  ; and why it is not a core feature of Mercurial.  ;  ; http://www.selenic.com/mercurial/wiki/index.cgi/KeywordExtension  ; http://www.selenic.com/mercurial/wiki/index.cgi/KeywordPlan  ;  ; If you encounter strange problems using Mercurial, a good first  ; debugging step would be to disable this extension.  ;  [keyword]  ; expand keywords in all python files in working dir  ;**.py =    [keywordmaps]  ; See documentation for examples