(stable) merge stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 02 Jul 2009 10:56:01 +0200
branchstable
changeset 603 474063ef3f3d
parent 601 b5eb8a9938aa (current diff)
parent 602 b21fe4c86037 (diff)
child 605 894fa61f2e0b
(stable) merge
--- 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)