--- a/hgext/bookmarks.py Thu Sep 02 14:45:16 2010 +0200
+++ b/hgext/bookmarks.py Thu Sep 02 17:28:20 2010 +0200
@@ -451,8 +451,8 @@
ui.status(_("deleting remote bookmark %s\n") % b)
new = '' # delete
else:
- ui.warn(_('bookmark %s does not exist on the local'
- ' or remote repository!\n') % b)
+ ui.warn(_('bookmark %s does not exist on the local '
+ 'or remote repository!\n') % b)
return 2
old = rb.get(b, '')
r = other.pushkey('bookmarks', b, old, new)
--- a/mercurial/help.py Thu Sep 02 14:45:16 2010 +0200
+++ b/mercurial/help.py Thu Sep 02 17:28:20 2010 +0200
@@ -83,7 +83,7 @@
return loader
helptable = [
- (["config"], _("Configuration Files"), loaddoc('config')),
+ (["config", "hgrc"], _("Configuration Files"), loaddoc('config')),
(["dates"], _("Date Formats"), loaddoc('dates')),
(["patterns"], _("File Name Patterns"), loaddoc('patterns')),
(['environment', 'env'], _('Environment Variables'),