Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
- changeset 3656
- 441956d8fce5
- parent 3484
- 645c12de6b0c
- child 4021
- 195a471c327b
equal
deleted
inserted
replaced
| 3654:ffeb85cdc72d | 3656:441956d8fce5 |
|---|---|
| 7 Module implementing a dialog to enter the data for a merge operation. | 7 Module implementing a dialog to enter the data for a merge operation. |
| 8 """ | 8 """ |
| 9 | 9 |
| 10 from __future__ import unicode_literals | 10 from __future__ import unicode_literals |
| 11 | 11 |
| 12 from PyQt4.QtCore import QRegExp | 12 from PyQt5.QtCore import QRegExp |
| 13 from PyQt4.QtGui import QDialog, QDialogButtonBox | 13 from PyQt5.QtWidgets import QDialog, QDialogButtonBox |
| 14 | 14 |
| 15 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog | 15 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog |
| 16 | 16 |
| 17 | 17 |
| 18 class SvnMergeDialog(QDialog, Ui_SvnMergeDialog): | 18 class SvnMergeDialog(QDialog, Ui_SvnMergeDialog): |
