# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1285575619 -7200
# Node ID 7e508cf1643870ec3a598b7f9b045d0302d1f503
# Parent  e7d45e41338c234785e38c02e2ee47432376a352# Parent  552e0cfbddbd1b3f07eae4750ef5057519c644b9
merge with stable

diff -r e7d45e41338c -r 7e508cf16438 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')),