# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1276165981 -3600
# Node ID 36f51ccd65d3dc30d8cb4591c161bfa8080fbd58
# Parent  c5badbf855dbfcaaa26b069915f390da81ab04e4# Parent  0492a5acf652ba3a7d0199d11f78a54e45b61bcc
Merge with stable

diff -r c5badbf855db -r 36f51ccd65d3 hgkw/keyword.py
--- 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]...')),