Mercurial > hg
diff mercurial/help/config.txt @ 24542:9fbda55c68d7
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 31 Mar 2015 16:14:14 -0500 |
parents | ff14b26fe5f4 d09262d6ec23 |
children | 7d01371e6358 |
line wrap: on
line diff
--- a/mercurial/help/config.txt Sun Mar 29 19:47:16 2015 -0700 +++ b/mercurial/help/config.txt Tue Mar 31 16:14:14 2015 -0500 @@ -1391,13 +1391,13 @@ format. Defaults to showing the hash, tags, branches, bookmarks, author, and the first line of the commit description. - You have to pay attention to encodings of managed files, if you - use non-ASCII characters in tags, branches, bookmarks, author - and/or commit descriptions. At template expansion, non-ASCII - characters use the encoding specified by ``--encoding`` global - option, ``HGENCODING`` or other locale setting environment - variables. The difference of encoding between merged file and - conflict markers causes serious problem. + 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 + specified by the ``--encoding`` global option, ``HGENCODING`` or other + environment variables that govern your locale. If the encoding of the merge + markers is different from the encoding of the merged files, + serious problems may occur. ``portablefilenames`` Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.