Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
- changeset 1112
- 8a7d1b9d18db
- parent 945
- 8cd4d08fa9f6
- child 1131
- 7781e396c903
equal
deleted
inserted
replaced
| 1109:9552b5e16a07 | 1112:8a7d1b9d18db |
|---|---|
| 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 PyQt4.QtCore import * | 10 from PyQt4.QtCore import QRegExp |
| 11 from PyQt4.QtGui import * | 11 from PyQt4.QtGui import QDialog, QDialogButtonBox |
| 12 | 12 |
| 13 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog | 13 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog |
| 14 | 14 |
| 15 | 15 |
| 16 class SvnMergeDialog(QDialog, Ui_SvnMergeDialog): | 16 class SvnMergeDialog(QDialog, Ui_SvnMergeDialog): |
