26 """ |
26 """ |
27 QDialog.__init__(self, parent) |
27 QDialog.__init__(self, parent) |
28 self.setupUi(self) |
28 self.setupUi(self) |
29 |
29 |
30 self.forceCheckBox.setChecked(force) |
30 self.forceCheckBox.setChecked(force) |
31 self.tagCombo.addItems(list(sorted(tagsList))) |
31 self.tagCombo.addItems(sorted(tagsList)) |
32 self.branchCombo.addItems(list(sorted(["default"] + branchesList))) |
32 self.branchCombo.addItems(["default"] + sorted(branchesList)) |
33 |
33 |
34 def getParameters(self): |
34 def getParameters(self): |
35 """ |
35 """ |
36 Public method to retrieve the merge data. |
36 Public method to retrieve the merge data. |
37 |
37 |