Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py

branch
5_0_x
changeset 738
170c7b28ba3f
parent 178
dd9f0bca5e2f
child 791
9ec2ac20e54e
equal deleted inserted replaced
732:e9e36c342b13 738:170c7b28ba3f
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

eric ide

mercurial