doc/hg.1.txt
changeset 3776 6859d049ed9c
parent 3530 4745cf66f77d
child 3800 54fd4d3b4fce
equal deleted inserted replaced
3775:a88e02081a88 3776:6859d049ed9c
   170     This is the name of the editor to use when committing. Defaults to the
   170     This is the name of the editor to use when committing. Defaults to the
   171     value of EDITOR.
   171     value of EDITOR.
   172 
   172 
   173     (deprecated, use .hgrc)
   173     (deprecated, use .hgrc)
   174 
   174 
       
   175 HGENCODING::
       
   176     This overrides the default locale setting detected by Mercurial.
       
   177     This setting is used to convert data including usernames,
       
   178     changeset descriptions, tag names, and branches. This setting can
       
   179     be overridden with the --encoding command-line option.
       
   180 
       
   181 HGENCODINGMODE::
       
   182     This sets Mercurial's behavior for handling unknown characters
       
   183     while transcoding user inputs. The default is "strict", which
       
   184     causes Mercurial to abort if it can't translate a character. Other
       
   185     settings include "replace", which replaces unknown characters, and
       
   186     "ignore", which drops them. This setting can be overridden with
       
   187     the --encodingmode command-line option.
       
   188 
   175 HGMERGE::
   189 HGMERGE::
   176     An executable to use for resolving merge conflicts. The program
   190     An executable to use for resolving merge conflicts. The program
   177     will be executed with three arguments: local file, remote file,
   191     will be executed with three arguments: local file, remote file,
   178     ancestor file.
   192     ancestor file.
   179 
   193