Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
- changeset 3008
- 7848489bcb92
- parent 2302
- f29e9405c851
- child 3057
- 10516539f238
- child 3160
- 209a07d7e401
equal
deleted
inserted
replaced
| 3007:bad2e89047e7 | 3008:7848489bcb92 |
|---|---|
| 15 | 15 |
| 16 class HgMergeDialog(QDialog, Ui_HgMergeDialog): | 16 class HgMergeDialog(QDialog, Ui_HgMergeDialog): |
| 17 """ | 17 """ |
| 18 Class implementing a dialog to enter the data for a merge operation. | 18 Class implementing a dialog to enter the data for a merge operation. |
| 19 """ | 19 """ |
| 20 def __init__(self, force, tagsList, branchesList, bookmarksList=None, parent=None): | 20 def __init__(self, force, tagsList, branchesList, bookmarksList=None, |
| 21 parent=None): | |
| 21 """ | 22 """ |
| 22 Constructor | 23 Constructor |
| 23 | 24 |
| 24 @param force flag indicating a forced merge (boolean) | 25 @param force flag indicating a forced merge (boolean) |
| 25 @param tagsList list of tags (list of strings) | 26 @param tagsList list of tags (list of strings) |
