Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 28288:e417e4512b0f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Tue, 01 Mar 2016 03:28:46 +0900
parents bb14a81ce647
children 549ff28a345f
line wrap: on
line diff
--- 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