206 if tool not in disabled]) |
206 if tool not in disabled]) |
207 uimerge = ui.config("ui", "merge") |
207 uimerge = ui.config("ui", "merge") |
208 if uimerge: |
208 if uimerge: |
209 # external tools defined in uimerge won't be able to handle |
209 # external tools defined in uimerge won't be able to handle |
210 # change/delete conflicts |
210 # change/delete conflicts |
211 if uimerge not in names and not changedelete: |
211 if check(uimerge, path, symlink, binary, changedelete): |
212 return (uimerge, uimerge) |
212 if uimerge not in names and not changedelete: |
213 tools.insert(0, (None, uimerge)) # highest priority |
213 return (uimerge, uimerge) |
|
214 tools.insert(0, (None, uimerge)) # highest priority |
214 tools.append((None, "hgmerge")) # the old default, if found |
215 tools.append((None, "hgmerge")) # the old default, if found |
215 for p, t in tools: |
216 for p, t in tools: |
216 if check(t, None, symlink, binary, changedelete): |
217 if check(t, None, symlink, binary, changedelete): |
217 toolpath = _findtool(ui, t) |
218 toolpath = _findtool(ui, t) |
218 return (t, _quotetoolpath(toolpath)) |
219 return (t, _quotetoolpath(toolpath)) |