206 |
206 |
207 ``alias`` |
207 ``alias`` |
208 --------- |
208 --------- |
209 |
209 |
210 Defines command aliases. |
210 Defines command aliases. |
|
211 |
211 Aliases allow you to define your own commands in terms of other |
212 Aliases allow you to define your own commands in terms of other |
212 commands (or aliases), optionally including arguments. Positional |
213 commands (or aliases), optionally including arguments. Positional |
213 arguments in the form of ``$1``, ``$2``, etc in the alias definition |
214 arguments in the form of ``$1``, ``$2``, etc in the alias definition |
214 are expanded by Mercurial before execution. Positional arguments not |
215 are expanded by Mercurial before execution. Positional arguments not |
215 already used by ``$N`` in the definition are put at the end of the |
216 already used by ``$N`` in the definition are put at the end of the |
1444 |
1445 |
1445 ``mergemarkertemplate`` |
1446 ``mergemarkertemplate`` |
1446 The template used to print the commit description next to each conflict |
1447 The template used to print the commit description next to each conflict |
1447 marker during merge conflicts. See :hg:`help templates` for the template |
1448 marker during merge conflicts. See :hg:`help templates` for the template |
1448 format. |
1449 format. |
|
1450 |
1449 Defaults to showing the hash, tags, branches, bookmarks, author, and |
1451 Defaults to showing the hash, tags, branches, bookmarks, author, and |
1450 the first line of the commit description. |
1452 the first line of the commit description. |
|
1453 |
1451 If you use non-ASCII characters in names for tags, branches, bookmarks, |
1454 If you use non-ASCII characters in names for tags, branches, bookmarks, |
1452 authors, and/or commit descriptions, you must pay attention to encodings of |
1455 authors, and/or commit descriptions, you must pay attention to encodings of |
1453 managed files. At template expansion, non-ASCII characters use the encoding |
1456 managed files. At template expansion, non-ASCII characters use the encoding |
1454 specified by the ``--encoding`` global option, ``HGENCODING`` or other |
1457 specified by the ``--encoding`` global option, ``HGENCODING`` or other |
1455 environment variables that govern your locale. If the encoding of the merge |
1458 environment variables that govern your locale. If the encoding of the merge |