Mercurial > hg
comparison mercurial/help/merge-tools.txt @ 17267:979b107eaea2 stable
doc: unify section level between help topics
Some help topics use "-" for the top level underlining section mark,
but "-" is used also for the top level categorization in generated
documents: "hg.1.html", for example.
So, TOC in such documents contain "sections in each topics", too.
This patch changes underlining section mark in some help topics to
unify section level in generated documents.
After this patching, levels of each section marks are:
level0
""""""
level1
======
level2
------
level3
......
level4
######
And use of section markers in each documents are:
- mercurial/help/*.txt can use level1 or more
(now these use level1 and level2)
- help for core commands can use level2 or more
(now these use no section marker)
- descriptions of extensions can use level2 or more
(now hgext/acl uses level2)
- help for commands defined in extension can use level4 or more
(now "convert" of hgext/convert uses level4)
"Level0" is used as top level categorization only in "doc/hg.1.txt"
and the intermediate file generated by "doc/gendoc.py", so end users
don't see it in "hg help" outoput and so on.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Wed, 25 Jul 2012 16:40:38 +0900 |
| parents | 0c4bec9596d8 |
| children | f1a3ae7c15df |
comparison
equal
deleted
inserted
replaced
| 17266:4e35dea77e31 | 17267:979b107eaea2 |
|---|---|
| 15 conflicting merges, either in a graphical way, or by inserting some | 15 conflicting merges, either in a graphical way, or by inserting some |
| 16 conflict markers. Mercurial does not include any interactive merge | 16 conflict markers. Mercurial does not include any interactive merge |
| 17 programs but relies on external tools for that. | 17 programs but relies on external tools for that. |
| 18 | 18 |
| 19 Available merge tools | 19 Available merge tools |
| 20 """"""""""""""""""""" | 20 ===================== |
| 21 | 21 |
| 22 External merge tools and their properties are configured in the | 22 External merge tools and their properties are configured in the |
| 23 merge-tools configuration section - see hgrc(5) - but they can often just | 23 merge-tools configuration section - see hgrc(5) - but they can often just |
| 24 be named by their executable. | 24 be named by their executable. |
| 25 | 25 |
| 38 | 38 |
| 39 Internal tools are always available and do not require a GUI but will by default | 39 Internal tools are always available and do not require a GUI but will by default |
| 40 not handle symlinks or binary files. | 40 not handle symlinks or binary files. |
| 41 | 41 |
| 42 Choosing a merge tool | 42 Choosing a merge tool |
| 43 """"""""""""""""""""" | 43 ===================== |
| 44 | 44 |
| 45 Mercurial uses these rules when deciding which merge tool to use: | 45 Mercurial uses these rules when deciding which merge tool to use: |
| 46 | 46 |
| 47 1. If a tool has been specified with the --tool option to merge or resolve, it | 47 1. If a tool has been specified with the --tool option to merge or resolve, it |
| 48 is used. If it is the name of a tool in the merge-tools configuration, its | 48 is used. If it is the name of a tool in the merge-tools configuration, its |