Mercurial Repositories > eric / file diff

diff -r bad2e89047e7 -r 7848489bcb92 Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Fri Oct 11 19:51:20 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Sat Oct 12 15:01:28 2013 +0200
@@ -17,7 +17,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