Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
- branch
- Py2 comp.
- changeset 3057
- 10516539f238
- parent 2525
- 8b507a9a2d40
- parent 3008
- 7848489bcb92
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3056:9986ec0e559a | 3057:10516539f238 |
|---|---|
| 17 | 17 |
| 18 class HgMergeDialog(QDialog, Ui_HgMergeDialog): | 18 class HgMergeDialog(QDialog, Ui_HgMergeDialog): |
| 19 """ | 19 """ |
| 20 Class implementing a dialog to enter the data for a merge operation. | 20 Class implementing a dialog to enter the data for a merge operation. |
| 21 """ | 21 """ |
| 22 def __init__(self, force, tagsList, branchesList, bookmarksList=None, parent=None): | 22 def __init__(self, force, tagsList, branchesList, bookmarksList=None, |
| 23 parent=None): | |
| 23 """ | 24 """ |
| 24 Constructor | 25 Constructor |
| 25 | 26 |
| 26 @param force flag indicating a forced merge (boolean) | 27 @param force flag indicating a forced merge (boolean) |
| 27 @param tagsList list of tags (list of strings) | 28 @param tagsList list of tags (list of strings) |
