filemerge: fix pattern matching

mercurial/filemerge.py

@@ -47,7 +47,7 b' def _picktool(repo, ui, path, binary, sy'
         return os.environ.get("HGMERGE")
 
     # then patterns
-    for pattern, tool in ui.configitems("merge-patterns"):
+    for pat, tool in ui.configitems("merge-patterns"):
         mf = util.matcher(repo.root, "", [pat], [], [])[1]
         if mf(path) and check(tool, pat, symlink, False):
                 return tool