Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Tue, 20 Apr 2010 02:37:20 +0200
changeset 731 a61028bb0c8e
parent 729 e61c92cf8a08 (current diff)
parent 730 bd1722740798 (diff)
child 733 67708fe93c99
Merge with stable
--- a/hgkw/keyword.py	Thu Apr 15 22:16:14 2010 +0200
+++ b/hgkw/keyword.py	Tue Apr 20 02:37:20 2010 +0200
@@ -471,10 +471,10 @@
 
     # monkeypatches
     def kwpatchfile_init(orig, self, ui, fname, opener,
-                         missing=False, eol=None):
+                         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, opener, missing, eol)
+        orig(self, ui, fname, opener, missing, eolmode)
         # shrink keywords read from working dir
         self.lines = kwt.shrinklines(self.fname, self.lines)