Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
- branch
- Py2 comp.
- changeset 3145
- a9de05d4a22f
- parent 3060
- 5883ce99ee12
- child 3161
- 06f57a834adf
equal
deleted
inserted
replaced
| 3144:bb63e24383e4 | 3145:a9de05d4a22f |
|---|---|
| 5 | 5 |
| 6 """ | 6 """ |
| 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 # __IGNORE_WARNING__ | 10 from __future__ import unicode_literals |
| 11 | 11 |
| 12 from PyQt4.QtCore import QRegExp | 12 from PyQt4.QtCore import QRegExp |
| 13 from PyQt4.QtGui import QDialog, QDialogButtonBox | 13 from PyQt4.QtGui import QDialog, QDialogButtonBox |
| 14 | 14 |
| 15 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog | 15 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog |
