doc/hg.1.txt
changeset 608 d2994b5298fb
parent 606 ea4526f9b1a5
child 612 9cd745437269
equal deleted inserted replaced
607:94744f6fe0e7 608:d2994b5298fb
   413 ENVIRONMENT VARIABLES
   413 ENVIRONMENT VARIABLES
   414 ---------------------
   414 ---------------------
   415 
   415 
   416 HGEDITOR::
   416 HGEDITOR::
   417     This is the name of the editor to use when committing. Defaults to the
   417     This is the name of the editor to use when committing. Defaults to the
   418     value of EDITOR.
   418     value of EDITOR. 
       
   419 
       
   420     (deprecated, use .hgrc)
   419 
   421 
   420 HGMERGE::
   422 HGMERGE::
   421     An executable to use for resolving merge conflicts. The program
   423     An executable to use for resolving merge conflicts. The program
   422     will be executed with three arguments: local file, remote file,
   424     will be executed with three arguments: local file, remote file,
   423     ancestor file.
   425     ancestor file.
   424 
   426 
   425     The default program is "hgmerge", which is a shell script provided
   427     The default program is "hgmerge", which is a shell script provided
   426     by Mercurial with some sensible defaults.
   428     by Mercurial with some sensible defaults.
   427 
   429 
       
   430     (deprecated, use .hgrc)
       
   431 
   428 HGUSER::
   432 HGUSER::
   429     This is the string used for the author of a commit.
   433     This is the string used for the author of a commit.
       
   434 
       
   435     (deprecated, use .hgrc)
   430 
   436 
   431 EMAIL::
   437 EMAIL::
   432     If HGUSER is not set, this will be used as the author for a commit.
   438     If HGUSER is not set, this will be used as the author for a commit.
   433 
   439 
   434 LOGNAME::
   440 LOGNAME::
   455     contents.
   461     contents.
   456 
   462 
   457  $HOME/.hgrc, .hg/hgrc::
   463  $HOME/.hgrc, .hg/hgrc::
   458     This file contains defaults and configuration. Values in .hg/hgrc
   464     This file contains defaults and configuration. Values in .hg/hgrc
   459     override those in .hgrc.
   465     override those in .hgrc.
       
   466 
       
   467 
       
   468 UI OPTIONS
       
   469 ----------
       
   470 
       
   471 Various configuration options can be set in .hgrc:
       
   472 
       
   473 -------------
       
   474 [ui]
       
   475 verbose = 0
       
   476 username = Matt Mackall <mpm@selenic.com>
       
   477 editor = hgeditor
       
   478 merge = hgmerge
       
   479 -------------
       
   480 
   460 
   481 
   461 NAMED REPOSITORIES
   482 NAMED REPOSITORIES
   462 ------------------
   483 ------------------
   463 
   484 
   464 To give symbolic names to a repository, create a section in .hgrc
   485 To give symbolic names to a repository, create a section in .hgrc