# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2015-09-29 19:33:31
# Node ID 19d946cf2a1bf921e78de18f52cfabcc3401035f
# Parent  2b31d8636f25ad32fb6aa787c6068d1b3a1b383e
# Parent  c15d8f84343e83c03ee11523ee1f00359ae94477

merge with stable

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -434,7 +434,7 @@ class localrepository(object):
                 heads.append(n)
         return heads
 
-    # _phaserevs and _phasesets depend on changelog. what wee need is to
+    # _phaserevs and _phasesets depend on changelog. what we need is to
     # call _phasecache.invalidate() if '00changelog.i' was changed, but it
     # can't be easily expressed in filecache mechanism.
     @storecache('phaseroots', '00changelog.i')