changeset 26409:19d946cf2a1b

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 29 Sep 2015 14:33:31 -0500
parents 2b31d8636f25 (current diff) c15d8f84343e (diff)
children 4c4b3c37776c
files mercurial/localrepo.py tests/test-commandserver.t
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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')