Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py

changeset 945
8cd4d08fa9f6
parent 791
9ec2ac20e54e
child 1017
919147f2b518
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Fri Mar 11 08:55:14 2011 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Fri Mar 11 16:51:57 2011 +0100
@@ -11,11 +11,12 @@
 
 from .Ui_HgMergeDialog import Ui_HgMergeDialog
 
+
 class HgMergeDialog(QDialog, Ui_HgMergeDialog):
     """
     Class implementing a dialog to enter the data for a merge operation.
     """
-    def __init__(self, force, tagsList, branchesList, parent = None):
+    def __init__(self, force, tagsList, branchesList, parent=None):
         """
         Constructor
         
@@ -35,7 +36,7 @@
         """
         Public method to retrieve the merge data.
         
-        @return tuple naming the revision and a flag indicating a 
+        @return tuple naming the revision and a flag indicating a
             forced merge (string, boolean)
         """
         if self.numberButton.isChecked():

eric ide

mercurial