# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1456770526 -32400
# Node ID e417e4512b0f00504db7f19ba92d0c9630114653
# Parent  adf32601916c0ee528020e75c169b4624b12c169
doc: remove deprecated option from synopsis of command help

Before this patch, deprecated options below are used in synopsis of
command help, even though they aren't listed up as available options
by default. These might confuse readers.

  - -n (no-op, now) of strip
  - -a/--active of branches
  - -f/--force of merge

diff -r adf32601916c -r e417e4512b0f hgext/strip.py
--- a/hgext/strip.py	Mon Feb 29 22:20:53 2016 -0300
+++ b/hgext/strip.py	Tue Mar 01 03:28:46 2016 +0900
@@ -90,7 +90,7 @@
                                 "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
 
diff -r adf32601916c -r e417e4512b0f mercurial/commands.py
--- a/mercurial/commands.py	Mon Feb 29 22:20:53 2016 -0300
+++ b/mercurial/commands.py	Tue Mar 01 03:28:46 2016 +0900
@@ -1232,7 +1232,7 @@
       _('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 @@
     ('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
 
diff -r adf32601916c -r e417e4512b0f tests/test-strip.t
--- a/tests/test-strip.t	Mon Feb 29 22:20:53 2016 -0300
+++ b/tests/test-strip.t	Tue Mar 01 03:28:46 2016 +0900
@@ -659,7 +659,7 @@
 
   $ 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