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

stable merge with paolof

Changeset 849cc7cdc4c4…

Parents 5b4f4ef632c7…

Parents 88eda8b0f73c…

by Steve Borho

Changes to one file · Browse files at 849cc7cdc4c4 Showing diff from parent 5b4f4ef632c7 88eda8b0f73c Diff from another changeset...

Change 1 of 11 Show Entire File doc/​source/​settings.txt Stacked
 
82
83
84
 
 
 
85
86
87
 
89
90
91
92
93
 
 
94
95
96
 
124
125
126
 
 
 
127
128
129
 
148
149
150
 
 
 
151
152
153
 
172
173
174
 
 
 
175
176
177
178
179
180
181
 
 
 
182
183
184
 
187
188
189
 
 
 
190
191
192
 
246
247
248
 
 
 
249
250
251
252
253
254
 
255
256
257
 
266
267
268
 
 
 
269
270
271
 
286
287
288
289
290
291
 
 
 
292
293
294
 
311
312
313
 
 
 
314
315
316
 
346
347
348
349
 
350
351
352
353
 
354
355
356
 
82
83
84
85
86
87
88
89
90
 
92
93
94
 
 
95
96
97
98
99
 
127
128
129
130
131
132
133
134
135
 
154
155
156
157
158
159
160
161
162
 
181
182
183
184
185
186
187
188
189
190
191
 
 
192
193
194
195
196
197
 
200
201
202
203
204
205
206
207
208
 
262
263
264
265
266
267
268
269
270
271
272
 
273
274
275
276
 
285
286
287
288
289
290
291
292
293
 
308
309
310
 
 
 
311
312
313
314
315
316
 
333
334
335
336
337
338
339
340
341
 
371
372
373
 
374
375
376
377
 
378
379
380
381
@@ -82,6 +82,9 @@
 :guilabel:`TortoiseHg`, :guilabel:`Commit`, :guilabel:`Changelog`, which  are specifically for TortoiseHg).   +.. module:: TortoiseHg.settings + :synopsis: Dialog used to set general TortoiseHg preferences +  TortoiseHg  ----------   @@ -89,8 +92,8 @@
  Graphical merge program for resolving merge conflicts. If left   unspecified, Mercurial will use the first applicable tool it finds   on your system or use its internal merge tool that leaves conflict - markers in place. Chose internal:merge to force conflict markers, - internal:prompt to always select local or other, or internal:dump + markers in place. Chose :guilabel:`internal:merge` to force conflict markers, + :guilabel:`internal:prompt` to always select local or other, or :guilabel:`internal:dump`   to leave files in the working directory for manual merging.    :guilabel:`Visual Diff Command:` @@ -124,6 +127,9 @@
  commit dialogs.   Default: False (show diffs to right of file list).   +.. module:: commit.settings + :synopsis: Dialog used to set commit specific preferences +  Commit  ------   @@ -148,6 +154,9 @@
  if any lines are too long at commit.   Default: 0 (unenforced).   +.. module:: changelog.settings + :synopsis: Dialog used to set changelog specific preferences +  Changelog  ---------   @@ -172,13 +181,17 @@
  of the currently selected changeset into the clipboard.   Default: False.   +.. module:: synchronize.settings + :synopsis: Dialog used to set synchronize specific preferences +  Sync  ----    :guilabel:`After pull operation:`   Operation which is performed directly after a successful pull. - update equates to pull --update, fetch equates to the fetch - extension, rebase equates to pull --rebase. Default: none. + :guilabel:`update` equates to :command:`pull --update`, :guilabel:`fetch` + equates to the fetch extension, :guilabel:`rebase` equates to + :command:`pull --rebase`. Default: none.    :guilabel:`Remote repository paths`   In this pane you can configure aliases for repositories that you @@ -187,6 +200,9 @@
  be listed in the Synchronize tool path drop-down box, and they can   be used as short-cuts on the command line.   +.. module:: web.settings + :synopsis: Dialog used to set web server specific preferences +  Web  ---   @@ -246,12 +262,15 @@
 :guilabel:`Encoding:`   Character encoding name.   +.. module:: proxy.settings + :synopsis: Dialog used to set proxy specific preferences +  Proxy  -----    :guilabel:`Host:`   Host name and (optional) port of proxy server, for - example "myproxy:8000". + example ``myproxy:8000``.    :guilabel:`Bypass List:`   Optional. Comma-separated list of host names that @@ -266,6 +285,9 @@
  proxy server.     +.. module:: email.settings + :synopsis: Dialog used to set email specific preferences +  Email  -----   @@ -286,9 +308,9 @@
 :guilabel:`method:`   Optional. Method to use to send email messages. If value is "smtp" (default),   use SMTP (configured below). Otherwise, use as name of program to run that - acts like sendmail (takes "-f" option for sender, list of recipients on - command line, message on stdin). Normally, setting this to "sendmail" or - "/usr/sbin/sendmail" is enough to use sendmail to send messages. + acts like sendmail (takes :command:`-f` option for sender, list of recipients on + command line, message on stdin). Normally, setting this to ``sendmail`` or + ``/usr/sbin/sendmail`` is enough to use sendmail to send messages.    :guilabel:`SMTP Host:`   Host name of mail server. @@ -311,6 +333,9 @@
  Hostname the sender can use to identify itself to the mail server.     +.. module:: diff.settings + :synopsis: Dialog used to set diff specific preferences +  Diff  ----   @@ -346,11 +371,11 @@
    hgtk repoconfig   -for the repository settings or :: +for the repository settings (:file:`.hg/hgrc` file) or ::     hgtk userconfig   -for the user configuration. +for the user configuration (:file:`Mercurial.ini` file).    The syntax is simple, no options or parameters are needed, except the global options.