--- a/mercurial/commands.py Sun Aug 29 23:16:31 2010 +0200
+++ b/mercurial/commands.py Fri Aug 27 22:36:35 2010 -0400
@@ -1341,7 +1341,8 @@
if patchproblems:
if ui.config('ui', 'patch'):
ui.write(_(" (Current patch tool may be incompatible with patch,"
- " or misconfigured. Please check your .hgrc file)\n"))
+ " or misconfigured. Please check your configuration"
+ " file)\n"))
else:
ui.write(_(" Internal patcher failure, please report this error"
" to http://mercurial.selenic.com/bts/\n"))
@@ -1357,10 +1358,12 @@
if not cmdpath:
if editor == 'vi':
ui.write(_(" No commit editor set and can't find vi in PATH\n"))
- ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
+ ui.write(_(" (specify a commit editor in your configuration"
+ " file)\n"))
else:
ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
- ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
+ ui.write(_(" (specify a commit editor in your configuration"
+ " file)\n"))
problems += 1
# check username
@@ -1369,7 +1372,7 @@
user = ui.username()
except util.Abort, e:
ui.write(" %s\n" % e)
- ui.write(_(" (specify a username in your .hgrc file)\n"))
+ ui.write(_(" (specify a username in your configuration file)\n"))
problems += 1
if not problems:
@@ -2727,8 +2730,8 @@
Show definition of symbolic path name NAME. If no name is given,
show definition of all available names.
- Path names are defined in the [paths] section of
- ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a
+ Path names are defined in the [paths] section of your
+ configuration file and in ``/etc/mercurial/hgrc``. If run inside a
repository, ``.hg/hgrc`` is used, too.
The path names ``default`` and ``default-push`` have a special
@@ -2963,11 +2966,11 @@
"""redo merges or set/view the merge status of files
Merges with unresolved conflicts are often the result of
- non-interactive merging using the ``internal:merge`` hgrc setting,
- or a command-line merge tool like ``diff3``. The resolve command
- is used to manage the files involved in a merge, after :hg:`merge`
- has been run, and before :hg:`commit` is run (i.e. the working
- directory must have two parents).
+ non-interactive merging using the ``internal:merge`` configuration
+ setting, or a command-line merge tool like ``diff3``. The resolve
+ command is used to manage the files involved in a merge, after
+ :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
+ working directory must have two parents).
The resolve command can be used in the following ways: