Show More
@@ -281,6 +281,7 b' merge-tools::' | |||
|
281 | 281 | myHtmlTool.priority = 1 |
|
282 | 282 | |
|
283 | 283 | Supported arguments: |
|
284 | ||
|
284 | 285 | priority;; |
|
285 | 286 | The priority in which to evaluate this tool. |
|
286 | 287 | Default: 0. |
@@ -313,7 +314,7 b' merge-tools::' | |||
|
313 | 314 | fixeol;; |
|
314 | 315 | Attempt to fix up EOL changes caused by the merge tool. |
|
315 | 316 | Default: False |
|
316 |
gui |
|
|
317 | gui;; | |
|
317 | 318 | This tool requires a graphical interface to run. Default: False |
|
318 | 319 | regkey;; |
|
319 | 320 | Windows registry key which describes install location of this tool. |
@@ -563,6 +564,7 b' ui::' | |||
|
563 | 564 | fail to merge |
|
564 | 565 | |
|
565 | 566 | See the merge-tools section for more information on configuring tools. |
|
567 | ||
|
566 | 568 | patch;; |
|
567 | 569 | command to use to apply patches. Look for 'gpatch' or 'patch' in PATH if |
|
568 | 570 | unset. |
General Comments 0
You need to be logged in to leave comments.
Login now