# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1246524961 -7200
# Node ID 474063ef3f3d2ca6f203a6955852b60054320a85
# Parent  b5eb8a9938aae63b754601b9ce79483f525c2f49# Parent  b21fe4c86037b5af8f9a5c35bf6bad872121b4b4
(stable) merge

diff -r b5eb8a9938aa -r 474063ef3f3d hgkw/keyword.py
--- a/hgkw/keyword.py	Wed Jul 01 17:36:36 2009 +0200
+++ b/hgkw/keyword.py	Thu Jul 02 10:56:01 2009 +0200
@@ -495,7 +495,8 @@
                 release(lock, wlock)
 
     # monkeypatches
-    def kwpatchfile_init(orig, self, ui, fname, opener, missing=False, eol=None):
+    def kwpatchfile_init(orig, self, ui, fname, opener,
+                         missing=False, eol=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)