Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py

branch
Py2 comp.
changeset 3057
10516539f238
parent 2525
8b507a9a2d40
parent 3008
7848489bcb92
child 3145
a9de05d4a22f
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Tue Oct 15 22:03:54 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Fri Oct 18 23:00:41 2013 +0200
@@ -19,7 +19,8 @@
     """
     Class implementing a dialog to enter the data for a merge operation.
     """
-    def __init__(self, force, tagsList, branchesList, bookmarksList=None, parent=None):
+    def __init__(self, force, tagsList, branchesList, bookmarksList=None,
+                 parent=None):
         """
         Constructor
         

eric ide

mercurial