--- 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