Patchwork [STABLE] filemerge: clean up language in mergemarkertemplate help

login
register
mail settings
Submitter Nathan Goldbaum
Date March 31, 2015, 7:25 p.m.
Message ID <08449b386be2188a4cb1.1427829928@ROUS>
Download mbox | patch
Permalink /patch/8391/
State Accepted
Headers show

Comments

Nathan Goldbaum - March 31, 2015, 7:25 p.m.
# HG changeset patch
# User Nathan Goldbaum <ngoldbau@ucsc.edu>
# Date 1427828294 25200
#      Tue Mar 31 11:58:14 2015 -0700
# Branch stable
# Node ID 08449b386be2188a4cb18c80be57333f2e8f299b
# Parent  e810c7da1caef95ac7bfb115f4da3e6edeb3c24f
filemerge: clean up language in mergemarkertemplate help
Matt Mackall - March 31, 2015, 8:22 p.m.
On Tue, 2015-03-31 at 12:25 -0700, Nathan Goldbaum wrote:
> # HG changeset patch
> # User Nathan Goldbaum <ngoldbau@ucsc.edu>
> # Date 1427828294 25200
> #      Tue Mar 31 11:58:14 2015 -0700
> # Branch stable
> # Node ID 08449b386be2188a4cb18c80be57333f2e8f299b
> # Parent  e810c7da1caef95ac7bfb115f4da3e6edeb3c24f
> filemerge: clean up language in mergemarkertemplate help

Queued for stable, thanks.

Patch

diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -1368,13 +1368,13 @@  User interface controls.
     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``.