##// END OF EJS Templates
hgrc.5: fix subsection formatting
Christian Ebert -
r6445:a1db3d8b default
parent child Browse files
Show More
@@ -281,6 +281,7 b' merge-tools::'
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.
@@ -313,7 +314,7 b' merge-tools::'
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.
@@ -563,6 +564,7 b' ui::'
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.
General Comments 0
You need to be logged in to leave comments. Login now