--- a/doc/hg.1.txt Sun Jul 03 21:14:40 2005 -0800
+++ b/doc/hg.1.txt Sun Jul 03 21:51:09 2005 -0800
@@ -415,7 +415,9 @@
HGEDITOR::
This is the name of the editor to use when committing. Defaults to the
- value of EDITOR.
+ value of EDITOR.
+
+ (deprecated, use .hgrc)
HGMERGE::
An executable to use for resolving merge conflicts. The program
@@ -425,9 +427,13 @@
The default program is "hgmerge", which is a shell script provided
by Mercurial with some sensible defaults.
+ (deprecated, use .hgrc)
+
HGUSER::
This is the string used for the author of a commit.
+ (deprecated, use .hgrc)
+
EMAIL::
If HGUSER is not set, this will be used as the author for a commit.
@@ -458,6 +464,21 @@
This file contains defaults and configuration. Values in .hg/hgrc
override those in .hgrc.
+
+UI OPTIONS
+----------
+
+Various configuration options can be set in .hgrc:
+
+-------------
+[ui]
+verbose = 0
+username = Matt Mackall <mpm@selenic.com>
+editor = hgeditor
+merge = hgmerge
+-------------
+
+
NAMED REPOSITORIES
------------------