diff -r e61c92cf8a08 -r a61028bb0c8e hgkw/keyword.py --- 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)