Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py	Thu Aug 22 15:47:14 2019 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py	Fri Aug 23 02:02:42 2019 +0300
@@ -25,13 +25,14 @@
     accepted = pyqtSignal()
     rejected = pyqtSignal()
     
-    def __init__(self, vcs, msg, mq, parent=None):
+    def __init__(self, vcs, msg, mq, merge, parent=None):
         """
         Constructor
         
         @param vcs reference to the vcs object
         @param msg initial message (string)
         @param mq flag indicating a queue commit (boolean)
+        @param merge flag indicating a merge commit (boolean)
         @param parent parent widget (QWidget)
         """
         super(HgCommitDialog, self).__init__(parent, Qt.WindowFlags(Qt.Window))
@@ -41,7 +42,7 @@
         
         self.logEdit.setPlainText(msg)
         
-        if mq:
+        if mq or merge:
             self.amendCheckBox.setVisible(False)
             self.subrepoCheckBox.setVisible(False)
         else: