# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2012-06-04 22:57:57
# Node ID d566aa319d5f7c58c69b985b53ff7498f08e53c6
# Parent  54b03085065f0b42bf5105188f3f631fcb2a715a
# Parent  00e1e40d709c49d1a124c62c3376d91ce1de2197

merge with stable

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3004,7 +3004,7 @@ def grep(ui, repo, pattern, *pats, **opt
     ('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