##// END OF EJS Templates
help/config: add blank lines
timeless@mozdev.org -
r26172:e05e5c6c default
parent child Browse files
Show More
@@ -208,6 +208,7 keys, and their possible values.
208 208 ---------
209 209
210 210 Defines command aliases.
211
211 212 Aliases allow you to define your own commands in terms of other
212 213 commands (or aliases), optionally including arguments. Positional
213 214 arguments in the form of ``$1``, ``$2``, etc in the alias definition
@@ -1446,8 +1447,10 User interface controls.
1446 1447 The template used to print the commit description next to each conflict
1447 1448 marker during merge conflicts. See :hg:`help templates` for the template
1448 1449 format.
1450
1449 1451 Defaults to showing the hash, tags, branches, bookmarks, author, and
1450 1452 the first line of the commit description.
1453
1451 1454 If you use non-ASCII characters in names for tags, branches, bookmarks,
1452 1455 authors, and/or commit descriptions, you must pay attention to encodings of
1453 1456 managed files. At template expansion, non-ASCII characters use the encoding
General Comments 0
You need to be logged in to leave comments. Login now