merge with stable
authorMatt Mackall <mpm@selenic.com>
Tue, 29 Sep 2015 14:33:31 -0500
changeset 26409 19d946cf2a1b
parent 26408 2b31d8636f25 (current diff)
parent 26405 c15d8f84343e (diff)
child 26410 4c4b3c37776c
merge with stable
mercurial/localrepo.py
tests/test-commandserver.t
--- 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')