Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Fri Mar 11 08:55:14 2011 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Fri Mar 11 16:51:57 2011 +0100
@@ -12,11 +12,12 @@
 
 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog
 
+
 class SvnMergeDialog(QDialog, Ui_SvnMergeDialog):
     """
     Class implementing a dialog to enter the data for a merge operation.
     """
-    def __init__(self, mergelist1, mergelist2, targetlist, force = False, parent = None):
+    def __init__(self, mergelist1, mergelist2, targetlist, force=False, parent=None):
         """
         Constructor
         
@@ -79,7 +80,7 @@
         @return tuple naming two tag names or two revisions, a target and
             a flag indicating a forced merge (string, string, string, boolean)
         """
-        return (self.tag1Combo.currentText(), 
+        return (self.tag1Combo.currentText(),
                 self.tag2Combo.currentText(),
                 self.targetCombo.currentText(),
                 self.forceCheckBox.isChecked())