merge with stable
authorMartin Geisler <mg@aragost.com>
Mon, 27 Sep 2010 10:20:19 +0200
changeset 12508 7e508cf16438
parent 12506 e7d45e41338c (current diff)
parent 12507 552e0cfbddbd (diff)
child 12509 4746a2e4b239
merge with stable
hgext/mq.py
--- a/hgext/mq.py	Sun Sep 26 16:11:04 2010 -0500
+++ b/hgext/mq.py	Mon Sep 27 10:20:19 2010 +0200
@@ -3046,7 +3046,7 @@
           ('n', 'name', '',
            _('merge queue name (DEPRECATED)'), _('NAME')),
           ('', 'move', None, _('reorder patch series and apply only the patch'))],
-         _('hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]')),
+         _('hg qpush [-f] [-l] [-a] [-n NAME] [--move] [PATCH | INDEX]')),
     "^qrefresh":
         (refresh,
          [('e', 'edit', None, _('edit commit message')),