Mercurial > hg

diff mercurial/filemerge.py @ 8567:fea40a677d43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
match: add some default args
author Matt Mackall <mpm@selenic.com>
date Sun, 24 May 2009 02:56:14 -0500
parents 744d6322b05b
children 94ca38e63576
line wrap: on
line diff
--- 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 + '"')