Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py

branch
6_1_x
changeset 5251
7d956dc02d8e
parent 4632
ca310db386ed
child 5389
9b1c800daff3
equal deleted inserted replaced
5249:a114f080572f 5251:7d956dc02d8e
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

eric ide

mercurial