comparison 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
comparison
equal deleted inserted replaced
694:51eb248d3348 705:574869103985
91 ID of the changeset to identify. 91 ID of the changeset to identify.
92 92
93 ui:: 93 ui::
94 User interface controls. 94 User interface controls.
95 debug;; 95 debug;;
96 Print debugging information. True or False. Default is True. 96 Print debugging information. True or False. Default is False.
97 editor;; 97 editor;;
98 The editor to use during a commit. Default is "vi". 98 The editor to use during a commit. Default is $EDITOR or "vi".
99 interactive;;
100 Allow to prompt the user. True or False. Default is True.
99 merge;; 101 merge;;
100 The conflict resolution program to use during a manual merge. 102 The conflict resolution program to use during a manual merge.
101 Default is "hgeditor". 103 Default is "hgmerge".
102 quiet;; 104 quiet;;
103 Reduce the amount of output printed. True or False. Default is 105 Reduce the amount of output printed. True or False. Default is False.
104 False.
105 username;; 106 username;;
106 The committer of a changeset created when running "commit". 107 The committer of a changeset created when running "commit".
107 Typically a person's name and email address, e.g. "Fred Widget 108 Typically a person's name and email address, e.g. "Fred Widget
108 <fred@example.com>". Default is username@hostname. 109 <fred@example.com>". Default is $EMAIL or username@hostname.
109 verbose;; 110 verbose;;
110 Increase the amount of output printed. True or False. Default is 111 Increase the amount of output printed. True or False. Default is False.
111 False.
112 112
113 AUTHOR 113 AUTHOR
114 ------ 114 ------
115 Bryan O'Sullivan <bos@serpentine.com>. 115 Bryan O'Sullivan <bos@serpentine.com>.
116 116