# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1210726058 -7200
# Node ID d2147d34798e3b4cf282494c7f832fa5cfc05315
# Parent  86c17b3e91002094b967a4ea9bd3fb03c7c59cd4# Parent  f83dd10a4d248bcd86cd75088afe6fadb9016650
(stable) merge with default to fix import from crew

1 hunk that removed "files" argument from patch.diff forgotten by me.

diff -r 86c17b3e9100 -r d2147d34798e hgkw/keyword.py
--- a/hgkw/keyword.py	Tue May 13 08:32:01 2008 +0200
+++ b/hgkw/keyword.py	Wed May 14 02:47:38 2008 +0200
@@ -513,7 +513,7 @@
             kwt.matcher = util.never
         elif node1 is not None and node1 != repo.changectx().node():
             kwt.restrict = True
-        patch_diff(repo, node1, node2, files, match, fp, changes, opts)
+        patch_diff(repo, node1, node2, match, fp, changes, opts)
 
     def kwweb_changeset(web, req, tmpl):
         '''Wraps webcommands.changeset turning off keyword expansion.'''