Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 10 Jun 2010 11:33:01 +0100
changeset 768 36f51ccd65d3
parent 765 c5badbf855db (current diff)
parent 767 0492a5acf652 (diff)
child 769 3bf3212b13bc
Merge with stable
--- a/hgkw/keyword.py	Tue Jun 01 01:05:45 2010 +0200
+++ b/hgkw/keyword.py	Thu Jun 10 11:33:01 2010 +0100
@@ -559,7 +559,8 @@
     'kwdemo':
         (demo,
          [('d', 'default', None, _('show default keyword template maps')),
-          ('f', 'rcfile', '', _('read maps from rcfile'))],
+          ('f', 'rcfile', '',
+           _('read maps from rcfile'), _('FILE'))],
          _('hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...')),
     'kwexpand': (expand, commands.walkopts,
                  _('hg kwexpand [OPTION]... [FILE]...')),