Show More
@@ -97,8 +97,11 b' def _picktool(repo, ui, path, binary, sy' | |||
|
97 | 97 | if check(t, None, symlink, binary): |
|
98 | 98 | toolpath = _findtool(ui, t) |
|
99 | 99 | return (t, '"' + toolpath + '"') |
|
100 | # internal merge as last resort | |
|
101 | return (not (symlink or binary) and "internal:merge" or None, None) | |
|
100 | ||
|
101 | # internal merge or prompt as last resort | |
|
102 | if symlink or binary: | |
|
103 | return "internal:prompt", None | |
|
104 | return "internal:merge", None | |
|
102 | 105 | |
|
103 | 106 | def _eoltype(data): |
|
104 | 107 | "Guess the EOL type of a file" |
General Comments 0
You need to be logged in to leave comments.
Login now