equal
deleted
inserted
replaced
58 |
58 |
59 # then patterns |
59 # then patterns |
60 for pat, tool in ui.configitems("merge-patterns"): |
60 for pat, tool in ui.configitems("merge-patterns"): |
61 mf = match.match(repo.root, '', [pat]) |
61 mf = match.match(repo.root, '', [pat]) |
62 if mf(path) and check(tool, pat, symlink, False): |
62 if mf(path) and check(tool, pat, symlink, False): |
63 toolpath = _findtool(ui, tool) |
63 toolpath = _findtool(ui, tool) |
64 return (tool, '"' + toolpath + '"') |
64 return (tool, '"' + toolpath + '"') |
65 |
65 |
66 # then merge tools |
66 # then merge tools |
67 tools = {} |
67 tools = {} |
68 for k, v in ui.configitems("merge-tools"): |
68 for k, v in ui.configitems("merge-tools"): |
69 t = k.split('.')[0] |
69 t = k.split('.')[0] |