--- a/mercurial/filemerge.py	Fri Jun 27 14:53:30 2008 -0500
+++ b/mercurial/filemerge.py	Fri Jun 27 18:28:45 2008 -0500
@@ -63,8 +63,7 @@
         if t not in tools:
             tools[t] = int(_toolstr(ui, t, "priority", "0"))
     names = tools.keys()
-    tools = [(-p,t) for t,p in tools.items()]
-    tools.sort()
+    tools = util.sort([(-p,t) for t,p in tools.items()])
     uimerge = ui.config("ui", "merge")
     if uimerge:
         if uimerge not in names: