# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1338850677 18000
# Node ID d566aa319d5f7c58c69b985b53ff7498f08e53c6
# Parent  54b03085065f0b42bf5105188f3f631fcb2a715a# Parent  00e1e40d709c49d1a124c62c3376d91ce1de2197
merge with stable

diff -r 54b03085065f -r d566aa319d5f 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