Merge with default stable
authorChristian Ebert <blacktrash@gmx.net>
Sat, 22 Oct 2011 15:45:19 +0100
branchstable
changeset 994 89f7a7e343c9
parent 991 68475648cd7e (current diff)
parent 993 e50f10baa81a (diff)
child 995 b78cce2b1430
Merge with default
--- 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):