Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
- changeset 5250
- 2f22b20ea9ad
- parent 4631
- 5c1a96925da4
- child 5389
- 9b1c800daff3
equal
deleted
inserted
replaced
| 5248:7675ecd58263 | 5250:2f22b20ea9ad |
|---|---|
| 11 from __future__ import unicode_literals | 11 from __future__ import unicode_literals |
| 12 | 12 |
| 13 import os | 13 import os |
| 14 | 14 |
| 15 from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer | 15 from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer |
| 16 from PyQt5.QtGui import QWidget | |
| 17 from PyQt5.QtWidgets import QAbstractButton, QDialogButtonBox, QHeaderView, \ | 16 from PyQt5.QtWidgets import QAbstractButton, QDialogButtonBox, QHeaderView, \ |
| 18 QTreeWidgetItem, QLineEdit, QApplication | 17 QTreeWidgetItem, QLineEdit, QApplication, QWidget |
| 19 | 18 |
| 20 from E5Gui import E5MessageBox | 19 from E5Gui import E5MessageBox |
| 21 from E5Gui.E5Application import e5App | 20 from E5Gui.E5Application import e5App |
| 22 | 21 |
| 23 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog | 22 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog |
