Mercurial > hg
comparison doc/hgrc.5.txt @ 6445:a1db3d8b9b8a
hgrc.5: fix subsection formatting
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Tue, 01 Apr 2008 14:35:11 +0200 |
parents | 41c77bb8d7f3 |
children | ee5313bc3c0c |
comparison
equal
deleted
inserted
replaced
6444:ad4996e41554 | 6445:a1db3d8b9b8a |
---|---|
279 myHtmlTool.args = -m $local $other $base $output | 279 myHtmlTool.args = -m $local $other $base $output |
280 myHtmlTool.regkey = Software\FooSoftware\HtmlMerge | 280 myHtmlTool.regkey = Software\FooSoftware\HtmlMerge |
281 myHtmlTool.priority = 1 | 281 myHtmlTool.priority = 1 |
282 | 282 |
283 Supported arguments: | 283 Supported arguments: |
284 | |
284 priority;; | 285 priority;; |
285 The priority in which to evaluate this tool. | 286 The priority in which to evaluate this tool. |
286 Default: 0. | 287 Default: 0. |
287 executable;; | 288 executable;; |
288 Either just the name of the executable or its pathname. | 289 Either just the name of the executable or its pathname. |
311 success. | 312 success. |
312 Default: False | 313 Default: False |
313 fixeol;; | 314 fixeol;; |
314 Attempt to fix up EOL changes caused by the merge tool. | 315 Attempt to fix up EOL changes caused by the merge tool. |
315 Default: False | 316 Default: False |
316 gui:; | 317 gui;; |
317 This tool requires a graphical interface to run. Default: False | 318 This tool requires a graphical interface to run. Default: False |
318 regkey;; | 319 regkey;; |
319 Windows registry key which describes install location of this tool. | 320 Windows registry key which describes install location of this tool. |
320 Mercurial will search for this key first under HKEY_CURRENT_USER and | 321 Mercurial will search for this key first under HKEY_CURRENT_USER and |
321 then under HKEY_LOCAL_MACHINE. Default: None | 322 then under HKEY_LOCAL_MACHINE. Default: None |
561 use the internal non-interactive merge tool | 562 use the internal non-interactive merge tool |
562 internal:fail;; | 563 internal:fail;; |
563 fail to merge | 564 fail to merge |
564 | 565 |
565 See the merge-tools section for more information on configuring tools. | 566 See the merge-tools section for more information on configuring tools. |
567 | |
566 patch;; | 568 patch;; |
567 command to use to apply patches. Look for 'gpatch' or 'patch' in PATH if | 569 command to use to apply patches. Look for 'gpatch' or 'patch' in PATH if |
568 unset. | 570 unset. |
569 quiet;; | 571 quiet;; |
570 Reduce the amount of output printed. True or False. Default is False. | 572 Reduce the amount of output printed. True or False. Default is False. |