mercurial/filemerge.py

--- a/mercurial/filemerge.py	Sun May 24 02:56:14 2009 -0500
+++ b/mercurial/filemerge.py	Sun May 24 02:56:14 2009 -0500
@@ -55,7 +55,7 @@
 
     # then patterns
     for pat, tool in ui.configitems("merge-patterns"):
-        mf = match.match(repo.root, '', [pat], [], [], 'glob')
+        mf = match.match(repo.root, '', [pat])
         if mf(path) and check(tool, pat, symlink, False):
                 toolpath = _findtool(ui, tool)
                 return (tool, '"' + toolpath + '"')