Mercurial > public > mercurial-scm > hg-stable
diff mercurial/help/diffs.txt @ 12083:ebfc46929f3e stable
help: refer to user configuration file more consistently
Currently, a number of commands and help topics mention the user hgrc
file in different ways. Among these are following:
1. .hgrc - "please specify your commit editor/username in your .hgrc
file", bookmarks, color, hgk, pager, hg help environment
2. $HOME/.hgrc - hg help paths, hgrc(5), hg(1)
3. ~/.hgrc - hgrc(5)
In addition to being inconsistent, none of these make sense on
Windows. This patch replaces the above with a more general term of
"[your] configuration file".
| author | Brodie Rao <brodie@bitheap.org> |
|---|---|
| date | Fri, 27 Aug 2010 22:36:35 -0400 |
| parents | 49a07f441496 |
| children |
line wrap: on
line diff
--- a/mercurial/help/diffs.txt Sun Aug 29 23:16:31 2010 +0200 +++ b/mercurial/help/diffs.txt Fri Aug 27 22:36:35 2010 -0400 @@ -25,5 +25,5 @@ To make Mercurial produce the git extended diff format, use the --git option available for many commands, or set 'git = True' in the [diff] -section of your hgrc. You do not need to set this option when -importing diffs in this format or using them in the mq extension. +section of your configuration file. You do not need to set this option +when importing diffs in this format or using them in the mq extension.