Mercurial Repositories > eric / file diff

diff -r 63a55933bdf3 -r efbfe57c8219 Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Sun Dec 05 18:02:46 2010 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Sun Dec 05 18:14:56 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):
         """