# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1305759066 -7200
# Node ID 12a2b9b99beba9e45efaba5f091fa2195f9053c4
# Parent  eb6ebe425bf668e7657f4a5f6c06b620ef3cf849# Parent  cf67cd5f683467d605ec3a851fa02edc2696f599
Merge with stable

diff -r eb6ebe425bf6 -r 12a2b9b99beb hgkw/keyword.py
--- a/hgkw/keyword.py	Wed May 18 23:30:45 2011 +0200
+++ b/hgkw/keyword.py	Thu May 19 00:51:06 2011 +0200
@@ -595,11 +595,11 @@
                 wlock.release()
 
     # monkeypatches
-    def kwpatchfile_init(orig, self, ui, fname, backend,
+    def kwpatchfile_init(orig, self, ui, fname, backend, mode,
                          missing=False, eolmode=None):
         '''Monkeypatch/wrap patch.patchfile.__init__ to avoid
         rejects or conflicts due to expanded keywords in working dir.'''
-        orig(self, ui, fname, backend, missing, eolmode)
+        orig(self, ui, fname, backend, mode, missing, eolmode)
         # shrink keywords read from working dir
         self.lines = kwt.shrinklines(self.fname, self.lines)