Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/filemerge.py
changeset 8209 a1a5a57efe90
parent 7873 4a4c7f6a5912
child 8225 46293a0c7e9f 
--- 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:
Mercurial