mercurial/filemerge.py

--- a/mercurial/filemerge.py	Sun Feb 03 23:58:02 2008 -0800
+++ b/mercurial/filemerge.py	Mon Feb 04 09:56:01 2008 -0600
@@ -47,7 +47,7 @@
         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