merge with stable
authorMatt Mackall <mpm@selenic.com>
Tue, 17 Aug 2010 13:22:20 -0500
changeset 11937 0b71e6f2362f
parent 11936 5b559934d504 (current diff)
parent 11927 8e56928e8991 (diff)
child 11938 b8b1e6e78486
merge with stable
mercurial/help/glossary.txt
--- a/mercurial/help/glossary.txt	Mon Aug 16 12:55:42 2010 -0500
+++ b/mercurial/help/glossary.txt	Tue Aug 17 13:22:20 2010 -0500
@@ -50,7 +50,7 @@
     :hg:`branches --active`.
 
     NOTE: this concept is deprecated because it is too implicit.
-    Branches show now be explicitly closed using :hg:`commit
+    Branches should now be explicitly closed using :hg:`commit
     --close-branch` when they are no longer needed.
 
 Branch, named