equal
deleted
inserted
replaced
193 |
193 |
194 # then patterns |
194 # then patterns |
195 for pat, tool in ui.configitems("merge-patterns"): |
195 for pat, tool in ui.configitems("merge-patterns"): |
196 mf = match.match(repo.root, '', [pat]) |
196 mf = match.match(repo.root, '', [pat]) |
197 if mf(path) and check(tool, pat, symlink, False, changedelete): |
197 if mf(path) and check(tool, pat, symlink, False, changedelete): |
|
198 if binary and not hascapability(tool, "binary", strict=True): |
|
199 ui.warn(_("warning: check merge-patterns configurations," |
|
200 " if %r for binary file %r is unintentional\n" |
|
201 "(see 'hg help merge-tools'" |
|
202 " for binary files capability)\n") |
|
203 % (pycompat.bytestr(tool), pycompat.bytestr(path))) |
198 toolpath = _findtool(ui, tool) |
204 toolpath = _findtool(ui, tool) |
199 return (tool, _quotetoolpath(toolpath)) |
205 return (tool, _quotetoolpath(toolpath)) |
200 |
206 |
201 # then merge tools |
207 # then merge tools |
202 tools = {} |
208 tools = {} |