Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
- changeset 12
- 1d8dd9706f46
- parent 0
- de9c2efb9d02
- child 13
- 1af94a91f439
equal
deleted
inserted
replaced
| 11:b0996e4a289e | 12:1d8dd9706f46 |
|---|---|
| 8 """ | 8 """ |
| 9 | 9 |
| 10 from PyQt4.QtCore import * | 10 from PyQt4.QtCore import * |
| 11 from PyQt4.QtGui import * | 11 from PyQt4.QtGui import * |
| 12 | 12 |
| 13 from Ui_SvnMergeDialog import Ui_SvnMergeDialog | 13 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog |
| 14 | 14 |
| 15 class SvnMergeDialog(QDialog, Ui_SvnMergeDialog): | 15 class SvnMergeDialog(QDialog, Ui_SvnMergeDialog): |
| 16 """ | 16 """ |
| 17 Class implementing a dialog to enter the data for a merge operation. | 17 Class implementing a dialog to enter the data for a merge operation. |
| 18 """ | 18 """ |
