Show More
@@ -60,10 +60,14 b' def _picktool(repo, ui, path, binary, sy' | |||||
60 | t = k.split('.')[0] |
|
60 | t = k.split('.')[0] | |
61 | if t not in tools: |
|
61 | if t not in tools: | |
62 | tools[t] = int(_toolstr(ui, t, "priority", "0")) |
|
62 | tools[t] = int(_toolstr(ui, t, "priority", "0")) | |
|
63 | names = tools.keys() | |||
63 | tools = [(-p,t) for t,p in tools.items()] |
|
64 | tools = [(-p,t) for t,p in tools.items()] | |
64 | tools.sort() |
|
65 | tools.sort() | |
65 |
|
|
66 | uimerge = ui.config("ui", "merge") | |
66 | tools.insert(0, (None, ui.config("ui", "merge"))) # highest priority |
|
67 | if uimerge: | |
|
68 | if uimerge not in names: | |||
|
69 | return (uimerge, uimerge) | |||
|
70 | tools.insert(0, (None, uimerge)) # highest priority | |||
67 | tools.append((None, "hgmerge")) # the old default, if found |
|
71 | tools.append((None, "hgmerge")) # the old default, if found | |
68 | for p,t in tools: |
|
72 | for p,t in tools: | |
69 | toolpath = _findtool(ui, t) |
|
73 | toolpath = _findtool(ui, t) |
General Comments 0
You need to be logged in to leave comments.
Login now