diff -r 11b0c7802a70 -r f9c57c6fa7c4 eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Fri Aug 30 19:25:42 2019 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sat Aug 31 12:18:44 2019 +0200
@@ -407,8 +407,6 @@
self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
self.refreshButton.setEnabled(False)
-
- self.statusList.setEnabled(not self.vcs.canCommitMerge(self.dname))
def __finish(self):
"""
@@ -575,8 +573,6 @@
"""
Private slot to refresh the status display.
"""
- self.statusList.setEnabled(not self.vcs.canCommitMerge(self.dname))
-
selectedItems = self.statusList.selectedItems()
if len(selectedItems) == 1:
self.__selectedName = selectedItems[0].text(self.__pathColumn)
@@ -935,7 +931,7 @@
"""
Private slot to handle the Commit Merge context menu entry.
"""
- self.vcs.vcsCommit(self.dname, 'Merge', merge=True)
+ self.vcs.vcsCommit(self.dname, self.tr('Merge'), merge=True)
self.__committed()
def __abortMerge(self):
