merge with stable
authorMatt Mackall <mpm@selenic.com>
Thu, 18 Aug 2011 17:24:04 -0500
changeset 15046 c019df62de45
parent 15043 0bb0f807dfc3 (current diff)
parent 15045 7f504202cb5c (diff)
child 15047 ef43610a4cce
merge with stable
mercurial/commands.py
mercurial/help/config.txt
--- a/mercurial/commands.py	Wed Aug 17 14:17:35 2011 +0200
+++ b/mercurial/commands.py	Thu Aug 18 17:24:04 2011 -0500
@@ -2523,7 +2523,9 @@
     no child changeset on the same branch.
 
     If one or more REVs are given, only branch heads on the branches
-    associated with the specified changesets are shown.
+    associated with the specified changesets are shown. This means
+    that you can use :hg:`heads foo` to see the heads on a branch
+    named ``foo``.
 
     If -c/--closed is specified, also show branch heads marked closed
     (see :hg:`commit --close-branch`).
--- a/mercurial/help/config.txt	Wed Aug 17 14:17:35 2011 +0200
+++ b/mercurial/help/config.txt	Thu Aug 18 17:24:04 2011 -0500
@@ -1166,7 +1166,7 @@
     extension. This will serve HTML files as ``text/html`` and might
     allow cross-site scripting attacks when serving untrusted
     repositories. Default is False.
-   
+
 ``allow_read``
     If the user has not already been denied repository access due to
     the contents of deny_read, this list determines whether to grant