--- a/mercurial/filemerge.py	Thu Nov 10 16:32:51 2016 -0500
+++ b/mercurial/filemerge.py	Thu Nov 10 16:33:07 2016 -0500
@@ -189,7 +189,8 @@
         if _toolbool(ui, t, "disabled", False):
             disabled.add(t)
     names = tools.keys()
-    tools = sorted([(-p, t) for t, p in tools.items() if t not in disabled])
+    tools = sorted([(-p, tool) for tool, p in tools.items()
+                    if tool not in disabled])
     uimerge = ui.config("ui", "merge")
     if uimerge:
         # external tools defined in uimerge won't be able to handle