Details
Details
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Branch
- default
- Lint
No Linters Available - Unit
No Unit Test Coverage
This is an archive of the discontinued Mercurial Phabricator instance.
Differential D9265
help: document the new [command-templates] config sectionClosedPublic
help: document the new [command-templates] config section
ClosedPublic
Authored by martinvonz on Oct 30 2020, 4:27 PM.
Revision Contents
Revision Contents
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/helptext/config.txt (8 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 42ad6589f62e | 793976f9029c | Martin von Zweigbergk | Oct 30 2020, 4:26 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
Diff 23389
Diff 23389
mercurial/helptext/config.txt
| managed files. At template expansion, non-ASCII characters use the encoding | managed files. At template expansion, non-ASCII characters use the encoding | ||||
| specified by the ``--encoding`` global option, ``HGENCODING`` or other | specified by the ``--encoding`` global option, ``HGENCODING`` or other | ||||
| environment variables that govern your locale. If the encoding of the merge | environment variables that govern your locale. If the encoding of the merge | ||||
| markers is different from the encoding of the merged files, | markers is different from the encoding of the merged files, | ||||
| serious problems may occur. | serious problems may occur. | ||||
| Can be overridden per-merge-tool, see the ``[merge-tools]`` section. | Can be overridden per-merge-tool, see the ``[merge-tools]`` section. | ||||
| ``oneline-summary`` | |||||
| A template used by `hg rebase` and other commands for showing a one-line | |||||
| summary of a commit. If the template configured here is longer than one | |||||
| line, then only the first line is used. | |||||
| The template can be overridden per command by defining a template in | |||||
| `oneline-summary.<command>`, where `<command>` can be e.g. "rebase". | |||||
| ``pre-merge-tool-output`` | ``pre-merge-tool-output`` | ||||
| A template that is printed before executing an external merge tool. This can | A template that is printed before executing an external merge tool. This can | ||||
| be used to print out additional context that might be useful to have during | be used to print out additional context that might be useful to have during | ||||
| the conflict resolution, such as the description of the various commits | the conflict resolution, such as the description of the various commits | ||||
| involved or bookmarks/tags. | involved or bookmarks/tags. | ||||
| Additional information is available in the ``local`, ``base``, and ``other`` | Additional information is available in the ``local`, ``base``, and ``other`` | ||||
| dicts. For example: ``{local.label}``, ``{base.name}``, or | dicts. For example: ``{local.label}``, ``{base.name}``, or | ||||