Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui
eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui
- branch
- eric7
- changeset 8428
- 2deec2f8a9ab
- parent 8312
- 800c432b34c8
equal
deleted
inserted
replaced
| 8427:5ccf32f95805 | 8428:2deec2f8a9ab |
|---|---|
| 146 <string>Commit Message:</string> | 146 <string>Commit Message:</string> |
| 147 </property> | 147 </property> |
| 148 </widget> | 148 </widget> |
| 149 </item> | 149 </item> |
| 150 <item> | 150 <item> |
| 151 <widget class="QPlainTextEdit" name="commitMessageEdit"> | 151 <widget class="EricSpellCheckedPlainTextEdit" name="commitMessageEdit"> |
| 152 <property name="toolTip"> | 152 <property name="toolTip"> |
| 153 <string>Enter a message for the merge commit</string> | 153 <string>Enter a message for the merge commit</string> |
| 154 </property> | 154 </property> |
| 155 <property name="tabChangesFocus"> | 155 <property name="tabChangesFocus"> |
| 156 <bool>true</bool> | 156 <bool>true</bool> |
| 190 </property> | 190 </property> |
| 191 </widget> | 191 </widget> |
| 192 </item> | 192 </item> |
| 193 </layout> | 193 </layout> |
| 194 </widget> | 194 </widget> |
| 195 <customwidgets> | |
| 196 <customwidget> | |
| 197 <class>EricSpellCheckedPlainTextEdit</class> | |
| 198 <extends>QPlainTextEdit</extends> | |
| 199 <header>EricWidgets/EricSpellCheckedTextEdit.h</header> | |
| 200 </customwidget> | |
| 201 </customwidgets> | |
| 195 <tabstops> | 202 <tabstops> |
| 196 <tabstop>idButton</tabstop> | 203 <tabstop>idButton</tabstop> |
| 197 <tabstop>idEdit</tabstop> | 204 <tabstop>idEdit</tabstop> |
| 198 <tabstop>tagButton</tabstop> | 205 <tabstop>tagButton</tabstop> |
| 199 <tabstop>tagCombo</tabstop> | 206 <tabstop>tagCombo</tabstop> |
