--- a/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui Tue Jun 15 19:42:36 2021 +0200 +++ b/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui Wed Jun 16 17:47:50 2021 +0200 @@ -148,7 +148,7 @@ </widget> </item> <item> - <widget class="QPlainTextEdit" name="commitMessageEdit"> + <widget class="EricSpellCheckedPlainTextEdit" name="commitMessageEdit"> <property name="toolTip"> <string>Enter a message for the merge commit</string> </property> @@ -192,6 +192,13 @@ </item> </layout> </widget> + <customwidgets> + <customwidget> + <class>EricSpellCheckedPlainTextEdit</class> + <extends>QPlainTextEdit</extends> + <header>EricWidgets/EricSpellCheckedTextEdit.h</header> + </customwidget> + </customwidgets> <tabstops> <tabstop>idButton</tabstop> <tabstop>idEdit</tabstop>