Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
- branch
- eric7
- changeset 8358
- 144a6b854f70
- parent 8356
- 68ec9c3d4de5
- child 8621
- 8c9f41115c04
equal
deleted
inserted
replaced
| 8357:a081458cc57b | 8358:144a6b854f70 |
|---|---|
| 12 from PyQt6.QtWidgets import ( | 12 from PyQt6.QtWidgets import ( |
| 13 QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem, | 13 QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem, |
| 14 QApplication, QWidget | 14 QApplication, QWidget |
| 15 ) | 15 ) |
| 16 | 16 |
| 17 from E5Gui.EricApplication import ericApp | 17 from EricWidgets.EricApplication import ericApp |
| 18 | 18 |
| 19 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog | 19 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog |
| 20 | 20 |
| 21 import Utilities.MimeTypes | 21 import Utilities.MimeTypes |
| 22 | 22 |
