Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
- changeset 7229
- 53054eb5b15a
- parent 6942
- 2602857055c5
- child 7257
- c4d0cac9b5c9
equal
deleted
inserted
replaced
| 7228:6037ddba57aa | 7229:53054eb5b15a |
|---|---|
| 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 __future__ import unicode_literals | |
| 12 | 11 |
| 13 import os | 12 import os |
| 14 | 13 |
| 15 from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer | 14 from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer |
| 16 from PyQt5.QtWidgets import QAbstractButton, QDialogButtonBox, QHeaderView, \ | 15 from PyQt5.QtWidgets import QAbstractButton, QDialogButtonBox, QHeaderView, \ |
