Mercurial > hg
comparison mercurial/help/config.txt @ 24536:d09262d6ec23 stable
filemerge: clean up language in mergemarkertemplate help
author | Nathan Goldbaum <ngoldbau@ucsc.edu> |
---|---|
date | Tue, 31 Mar 2015 11:58:14 -0700 |
parents | a04c7b74b3d5 |
children | 9fbda55c68d7 |
comparison
equal
deleted
inserted
replaced
24493:e810c7da1cae | 24536:d09262d6ec23 |
---|---|
1366 The template used to print the commit description next to each conflict | 1366 The template used to print the commit description next to each conflict |
1367 marker during merge conflicts. See :hg:`help templates` for the template | 1367 marker during merge conflicts. See :hg:`help templates` for the template |
1368 format. | 1368 format. |
1369 Defaults to showing the hash, tags, branches, bookmarks, author, and | 1369 Defaults to showing the hash, tags, branches, bookmarks, author, and |
1370 the first line of the commit description. | 1370 the first line of the commit description. |
1371 You have to pay attention to encodings of managed files, if you | 1371 If you use non-ASCII characters in names for tags, branches, bookmarks, |
1372 use non-ASCII characters in tags, branches, bookmarks, author | 1372 authors, and/or commit descriptions, you must pay attention to encodings of |
1373 and/or commit descriptions. At template expansion, non-ASCII | 1373 managed files. At template expansion, non-ASCII characters use the encoding |
1374 characters use the encoding specified by ``--encoding`` global | 1374 specified by the ``--encoding`` global option, ``HGENCODING`` or other |
1375 option, ``HGENCODING`` or other locale setting environment | 1375 environment variables that govern your locale. If the encoding of the merge |
1376 variables. The difference of encoding between merged file and | 1376 markers is different from the encoding of the merged files, |
1377 conflict markers causes serious problem. | 1377 serious problems may occur. |
1378 | 1378 |
1379 ``portablefilenames`` | 1379 ``portablefilenames`` |
1380 Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``. | 1380 Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``. |
1381 Default is ``warn``. | 1381 Default is ``warn``. |
1382 If set to ``warn`` (or ``true``), a warning message is printed on POSIX | 1382 If set to ``warn`` (or ``true``), a warning message is printed on POSIX |