mercurial/filemerge.py

--- a/mercurial/filemerge.py	Sun Apr 26 16:50:44 2009 -0500
+++ b/mercurial/filemerge.py	Sun Apr 26 16:50:44 2009 -0500
@@ -66,7 +66,7 @@
         if t not in tools:
             tools[t] = int(_toolstr(ui, t, "priority", "0"))
     names = tools.keys()
-    tools = util.sort([(-p,t) for t,p in tools.items()])
+    tools = sorted([(-p,t) for t,p in tools.items()])
     uimerge = ui.config("ui", "merge")
     if uimerge:
         if uimerge not in names: