# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1443555211 18000
# Node ID 19d946cf2a1bf921e78de18f52cfabcc3401035f
# Parent  2b31d8636f25ad32fb6aa787c6068d1b3a1b383e# Parent  c15d8f84343e83c03ee11523ee1f00359ae94477
merge with stable

diff -r 2b31d8636f25 -r 19d946cf2a1b mercurial/localrepo.py
--- a/mercurial/localrepo.py	Tue Sep 29 21:57:08 2015 +0900
+++ b/mercurial/localrepo.py	Tue Sep 29 14:33:31 2015 -0500
@@ -434,7 +434,7 @@
                 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')
diff -r 2b31d8636f25 -r 19d946cf2a1b tests/test-commandserver.t