Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
eric6/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
- changeset 7229
- 53054eb5b15a
- parent 6942
- 2602857055c5
- child 7360
- 9190402e4505
equal
deleted
inserted
replaced
| 7228:6037ddba57aa | 7229:53054eb5b15a |
|---|---|
| 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 | |
| 11 | 10 |
| 12 from PyQt5.QtCore import QRegExp | 11 from PyQt5.QtCore import QRegExp |
| 13 from PyQt5.QtWidgets import QDialog, QDialogButtonBox | 12 from PyQt5.QtWidgets import QDialog, QDialogButtonBox |
| 14 | 13 |
| 15 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog | 14 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog |
