changeset 16871:d566aa319d5f

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Jun 2012 17:57:57 -0500
parents 54b03085065f (current diff) 00e1e40d709c (diff)
children 40d930848fd0
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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