Mercurial Repositories > eric / file diff

diff -r 385f60c94548 -r 7c09585bd960 eric6/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py	Sat Apr 10 18:31:17 2021 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py	Sat Apr 10 18:38:27 2021 +0200
@@ -28,7 +28,7 @@
         @param remoteBranchesList list of remote branches (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super(GitMergeDialog, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
        
         self.buttonBox.button(