--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Fri Oct 09 17:19:29 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Sat Oct 10 12:20:51 2020 +0200 @@ -132,8 +132,6 @@ Private slot called when the process finished or the user pressed the button. """ - QApplication.restoreOverrideCursor() - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)