Mercurial > public > mercurial-scm > hg-stable

comparison 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
comparison
equal deleted inserted replaced
8566:744d6322b05b 8567:fea40a677d43
53 if hgmerge: 53 if hgmerge:
54 return (hgmerge, hgmerge) 54 return (hgmerge, hgmerge)
55 55
56 # then patterns 56 # then patterns
57 for pat, tool in ui.configitems("merge-patterns"): 57 for pat, tool in ui.configitems("merge-patterns"):
58 mf = match.match(repo.root, '', [pat], [], [], 'glob') 58 mf = match.match(repo.root, '', [pat])
59 if mf(path) and check(tool, pat, symlink, False): 59 if mf(path) and check(tool, pat, symlink, False):
60 toolpath = _findtool(ui, tool) 60 toolpath = _findtool(ui, tool)
61 return (tool, '"' + toolpath + '"') 61 return (tool, '"' + toolpath + '"')
62 62
63 # then merge tools 63 # then merge tools