Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
- branch
- eric7
- changeset 8318
- 962bce857696
- parent 8312
- 800c432b34c8
- child 8356
- 68ec9c3d4de5
equal
deleted
inserted
replaced
| 8316:0c7a44af84bc | 8318:962bce857696 |
|---|---|
| 6 """ | 6 """ |
| 7 Module implementing a dialog to show a list of files which had or still have | 7 Module implementing a dialog to show a list of files which had or still have |
| 8 conflicts. | 8 conflicts. |
| 9 """ | 9 """ |
| 10 | 10 |
| 11 from PyQt5.QtCore import pyqtSlot, Qt, QPoint | 11 from PyQt6.QtCore import pyqtSlot, Qt, QPoint |
| 12 from PyQt5.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.E5Application import e5App | 17 from E5Gui.E5Application import e5App |
