# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1319294719 -3600
# Node ID 89f7a7e343c91a1a1da24eeaac3ec17ba7f8b2f2
# Parent  68475648cd7e889535bbc4e85be1992f48680fa6# Parent  e50f10baa81a9eb6897d42ac6fda1c3edf6801b3
Merge with default

diff -r 68475648cd7e -r 89f7a7e343c9 hgkw/keyword.py
--- a/hgkw/keyword.py	Fri Sep 30 21:58:54 2011 -0400
+++ b/hgkw/keyword.py	Sat Oct 22 15:45:19 2011 +0100
@@ -237,7 +237,7 @@
 
     def iskwfile(self, cand, ctx):
         '''Returns subset of candidates which are configured for keyword
-        expansion are not symbolic links.'''
+        expansion but are not symbolic links.'''
         return [f for f in cand if self.match(f) and not 'l' in ctx.flags(f)]
 
     def overwrite(self, ctx, candidates, lookup, expand, rekw=False):