@@ -90,7 +90,7 @@ def strip(ui, repo, revs, update=True, b
"strip")),
('B', 'bookmark', [], _("remove revs only reachable from given"
" bookmark"))],
- _('hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV...'))
+ _('hg strip [-k] [-f] [-B bookmark] [-r] REV...'))
def stripcmd(ui, repo, *revs, **opts):
"""strip changesets and all their descendants from the repository
@@ -1232,7 +1232,7 @@ def branch(ui, repo, label=None, **opts)
_('show only branches that have unmerged heads (DEPRECATED)')),
('c', 'closed', False, _('show normal and closed branches')),
] + formatteropts,
- _('[-ac]'))
+ _('[-c]'))
def branches(ui, repo, active=False, closed=False, **opts):
"""list repository named branches
@@ -5175,7 +5175,7 @@ def manifest(ui, repo, node=None, rev=No
('P', 'preview', None,
_('review revisions to merge (no merge is performed)'))
] + mergetoolopts,
- _('[-P] [-f] [[-r] REV]'))
+ _('[-P] [[-r] REV]'))
def merge(ui, repo, node=None, **opts):
"""merge another revision into working directory
@@ -659,7 +659,7 @@ Make sure no one adds back a -b option:
$ hg strip -b tip
hg strip: option -b not recognized
- hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV...
+ hg strip [-k] [-f] [-B bookmark] [-r] REV...
strip changesets and all their descendants from the repository