Mercurial > hg
changeset 26172:e05e5c6ccd2f
help/config: add blank lines
| author | timeless@mozdev.org |
|---|---|
| date | Wed, 02 Sep 2015 02:02:58 -0400 |
| parents | 49c1424424de |
| children | 0f14c40a05c4 |
| files | mercurial/help/config.txt |
| diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/help/config.txt Fri Aug 28 13:52:49 2015 -0400 +++ b/mercurial/help/config.txt Wed Sep 02 02:02:58 2015 -0400 @@ -208,6 +208,7 @@ --------- Defines command aliases. + Aliases allow you to define your own commands in terms of other commands (or aliases), optionally including arguments. Positional arguments in the form of ``$1``, ``$2``, etc in the alias definition @@ -1446,8 +1447,10 @@ The template used to print the commit description next to each conflict marker during merge conflicts. See :hg:`help templates` for the template format. + Defaults to showing the hash, tags, branches, bookmarks, author, and the first line of the commit description. + If you use non-ASCII characters in names for tags, branches, bookmarks, authors, and/or commit descriptions, you must pay attention to encodings of managed files. At template expansion, non-ASCII characters use the encoding