Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
eric7/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
- branch
- eric7
- changeset 8318
- 962bce857696
- parent 8312
- 800c432b34c8
- child 8881
- 54e42bc2437a
equal
deleted
inserted
replaced
| 8316:0c7a44af84bc | 8318:962bce857696 |
|---|---|
| 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 import re | 10 import re |
| 11 | 11 |
| 12 from PyQt5.QtWidgets import QDialog, QDialogButtonBox | 12 from PyQt6.QtWidgets import QDialog, QDialogButtonBox |
| 13 | 13 |
| 14 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog | 14 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog |
| 15 | 15 |
| 16 | 16 |
| 17 class SvnMergeDialog(QDialog, Ui_SvnMergeDialog): | 17 class SvnMergeDialog(QDialog, Ui_SvnMergeDialog): |
