Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py
src/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py
- branch
- eric7
- changeset 9413
- 80c06d472826
- parent 9221
- bf71ee032bb4
- child 9653
- e67609152c5e
equal
deleted
inserted
replaced
| 9412:45e7bb09c120 | 9413:80c06d472826 |
|---|---|
| 8 """ | 8 """ |
| 9 | 9 |
| 10 from PyQt6.QtCore import pyqtSlot | 10 from PyQt6.QtCore import pyqtSlot |
| 11 from PyQt6.QtWidgets import QDialog, QDialogButtonBox | 11 from PyQt6.QtWidgets import QDialog, QDialogButtonBox |
| 12 | 12 |
| 13 from EricWidgets.EricApplication import ericApp | 13 from eric7.EricWidgets.EricApplication import ericApp |
| 14 | 14 |
| 15 from .Ui_GitMergeDialog import Ui_GitMergeDialog | 15 from .Ui_GitMergeDialog import Ui_GitMergeDialog |
| 16 | 16 |
| 17 | 17 |
| 18 class GitMergeDialog(QDialog, Ui_GitMergeDialog): | 18 class GitMergeDialog(QDialog, Ui_GitMergeDialog): |
