Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: fix pattern matching
authordhruva <dhruvakm@gmail.com>
Mon, 04 Feb 2008 09:56:01 -0600
changeset 6016 288ec2f6faa2
parent 6015 26ef792f834e
child 6018 404be894cf71
filemerge: fix pattern matching
mercurial/filemerge.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial