# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1357929195 0
# Node ID ce275f3522b2a339039e27329f435daf4e47abfb
# Parent  ecb744c2a1995913900755cf7e4c4508eb628b54# Parent  5eb5ba3b9e99170ae48feb06f6a5681c4bd79e3f
Merge with default

diff -r ecb744c2a199 -r ce275f3522b2 tests/test-keyword.t
--- a/tests/test-keyword.t	Wed Jan 09 13:16:54 2013 -0800
+++ b/tests/test-keyword.t	Fri Jan 11 18:33:15 2013 +0000
@@ -750,13 +750,13 @@
 |Note:
 |
 | After the last rollback, the "unserved" branchheads cache became invalid, but
-| all changeset in the repo were public. So filtering wise:
+| all changesets in the repo were public. For filtering this means:
 |   "mutable" == "unserved" == ø.
 |
-| As the "unserved" cache is invalid, we fall back to "mutable" cache. But not
-| update is needed between "mutable" and "unserved" cache and the "unserved"
-| cache is not updated on disk. The on disk version therefor stay invalid for
-| some time. This explains why the "unserved" branchheads cache is detect
+| As the "unserved" cache is invalid, we fall back to the "mutable" cache. But
+| no update is needed between "mutable" and "unserved" and the "unserved" cache
+| is not updated on disk. The on-disk version therefore stays invalid for some
+| time. This explains why the "unserved" branchheads cache is detected as
 | invalid here.
 
   $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'