Mercurial > hg > gitserve
diff doc/hgrc.5.txt @ 705:574869103985
Merge with TAH
manifest hash: 197e0d1a0d7376a9eb72381330462f06490ab821
| author | mpm@selenic.com |
|---|---|
| date | Thu, 14 Jul 2005 22:56:55 -0800 |
| parents | efa4a7e2f322 a1099c50a622 |
| children | 54b2a42e501e f15901d053e1 |
line wrap: on
line diff
--- a/doc/hgrc.5.txt Thu Jul 14 22:37:46 2005 -0800 +++ b/doc/hgrc.5.txt Thu Jul 14 22:56:55 2005 -0800 @@ -93,22 +93,22 @@ ui:: User interface controls. debug;; - Print debugging information. True or False. Default is True. + Print debugging information. True or False. Default is False. editor;; - The editor to use during a commit. Default is "vi". + The editor to use during a commit. Default is $EDITOR or "vi". + interactive;; + Allow to prompt the user. True or False. Default is True. merge;; The conflict resolution program to use during a manual merge. - Default is "hgeditor". + Default is "hgmerge". quiet;; - Reduce the amount of output printed. True or False. Default is - False. + Reduce the amount of output printed. True or False. Default is False. username;; The committer of a changeset created when running "commit". Typically a person's name and email address, e.g. "Fred Widget - <fred@example.com>". Default is username@hostname. + <fred@example.com>". Default is $EMAIL or username@hostname. verbose;; - Increase the amount of output printed. True or False. Default is - False. + Increase the amount of output printed. True or False. Default is False. AUTHOR ------