Mercurial > hg
changeset 3775:6859d049ed9c
Add documentation for charset encoding options
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 03 Dec 2006 16:16:33 -0600 |
parents | a88e02081a88 |
children | 037824e6d362 |
files | doc/hg.1.txt |
diffstat | 1 files changed, 14 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/hg.1.txt Sun Dec 03 16:16:33 2006 -0600 +++ b/doc/hg.1.txt Sun Dec 03 16:16:33 2006 -0600 @@ -172,6 +172,20 @@ (deprecated, use .hgrc) +HGENCODING:: + This overrides the default locale setting detected by Mercurial. + This setting is used to convert data including usernames, + changeset descriptions, tag names, and branches. This setting can + be overridden with the --encoding command-line option. + +HGENCODINGMODE:: + This sets Mercurial's behavior for handling unknown characters + while transcoding user inputs. The default is "strict", which + causes Mercurial to abort if it can't translate a character. Other + settings include "replace", which replaces unknown characters, and + "ignore", which drops them. This setting can be overridden with + the --encodingmode command-line option. + HGMERGE:: An executable to use for resolving merge conflicts. The program will be executed with three arguments: local file, remote file,