Mercurial Repositories > eric / file diff

diff -r dcdf0074ad39 -r 1b58dc890b87 eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py	Fri Sep 24 16:30:28 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py	Fri Sep 24 16:34:15 2021 +0200
@@ -10,6 +10,8 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
 
+from EricWidgets.EricApplication import ericApp
+
 from .Ui_GitMergeDialog import Ui_GitMergeDialog
 
 
@@ -34,6 +36,12 @@
         self.buttonBox.button(
             QDialogButtonBox.StandardButton.Ok).setEnabled(False)
         
+        project = ericApp().getObject("Project")
+        pwl, pel = project.getProjectDictionaries()
+        language = project.getProjectSpellLanguage()
+        self.commitMessageEdit.setLanguageWithPWL(
+            language, pwl or None, pel or None)
+        
         self.__currentBranch = currentBranch
         
         self.tagCombo.addItems(sorted(tagsList))