merge with stable
authorMatt Mackall <mpm@selenic.com>
Mon, 04 Jun 2012 17:57:57 -0500
changeset 16871 d566aa319d5f
parent 16870 54b03085065f (current diff)
parent 16869 00e1e40d709c (diff)
child 16872 40d930848fd0
merge with stable
mercurial/commands.py
--- a/mercurial/commands.py	Tue Jun 05 00:32:18 2012 +0200
+++ b/mercurial/commands.py	Mon Jun 04 17:57:57 2012 -0500
@@ -3004,7 +3004,7 @@
     ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
     ('c', 'closed', False, _('show normal and closed branch heads')),
     ] + templateopts,
-    _('[-ac] [-r STARTREV] [REV]...'))
+    _('[-ct] [-r STARTREV] [REV]...'))
 def heads(ui, repo, *branchrevs, **opts):
     """show current repository heads or show branch heads