Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
- changeset 3656
- 441956d8fce5
- parent 3619
- 4643a9ef7dd6
- child 4021
- 195a471c327b
equal
deleted
inserted
replaced
| 3654:ffeb85cdc72d | 3656:441956d8fce5 |
|---|---|
| 10 | 10 |
| 11 from __future__ import unicode_literals | 11 from __future__ import unicode_literals |
| 12 | 12 |
| 13 import os | 13 import os |
| 14 | 14 |
| 15 from PyQt4.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer | 15 from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer |
| 16 from PyQt4.QtGui import ( | 16 from PyQt5.QtGui import QWidget |
| 17 QWidget, QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem, | 17 from PyQt5.QtWidgets import QAbstractButton, QDialogButtonBox, QHeaderView, \ |
| 18 QLineEdit, QApplication) | 18 QTreeWidgetItem, QLineEdit, QApplication |
| 19 | 19 |
| 20 from E5Gui import E5MessageBox | 20 from E5Gui import E5MessageBox |
| 21 from E5Gui.E5Application import e5App | 21 from E5Gui.E5Application import e5App |
| 22 | 22 |
| 23 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog | 23 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog |
