Mercurial > hg
changeset 6016:288ec2f6faa2
filemerge: fix pattern matching
author | dhruva <dhruvakm@gmail.com> |
---|---|
date | Mon, 04 Feb 2008 09:56:01 -0600 |
parents | 26ef792f834e |
children | 404be894cf71 |
files | mercurial/filemerge.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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