Mercurial Repositories > eric / file diff
diff: Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
- branch
- 5_0_x
- changeset 738
- 170c7b28ba3f
- parent 178
- dd9f0bca5e2f
- child 791
- 9ec2ac20e54e
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Sat Dec 04 13:28:56 2010 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Sun Dec 05 18:11:22 2010 +0100 @@ -28,8 +28,8 @@ self.setupUi(self) self.forceCheckBox.setChecked(force) - self.tagCombo.addItems(list(sorted(tagsList))) - self.branchCombo.addItems(list(sorted(["default"] + branchesList))) + self.tagCombo.addItems(sorted(tagsList)) + self.branchCombo.addItems(["default"] + sorted(branchesList)) def getParameters(self): """
