# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1478813587 18000
# Node ID 8819b63732b9180247feaa90dd1e4b3129cf4180
# Parent  ca74c076710e43b60a8741f0622db92435bd430c
filemerge: avoid shadowing a variable in a list comprehension

diff -r ca74c076710e -r 8819b63732b9 mercurial/filemerge.py
--- 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