diff -r ffc693f87148 -r 549ff28a345f mercurial/commands.py
--- a/mercurial/commands.py	Mon Dec 21 22:26:31 2015 -0800
+++ b/mercurial/commands.py	Wed Mar 02 16:44:56 2016 -0600
@@ -1270,7 +1270,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
 
@@ -5234,7 +5234,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