Mercurial > hg-stable
changeset 16254:c7eef052c9e3 stable
filemerge: restore default prompt for binary/symlink lost in 83925d3a4559
This could result in a traceback.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 13 Mar 2012 15:12:26 -0500 |
| parents | cf17e76be4dd |
| children | ca5cc2976574 |
| files | mercurial/filemerge.py |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/filemerge.py Mon Mar 12 17:02:45 2012 -0300 +++ b/mercurial/filemerge.py Tue Mar 13 15:12:26 2012 -0500 @@ -97,8 +97,11 @@ if check(t, None, symlink, binary): toolpath = _findtool(ui, t) return (t, '"' + toolpath + '"') - # internal merge as last resort - return (not (symlink or binary) and "internal:merge" or None, None) + + # internal merge or prompt as last resort + if symlink or binary: + return "internal:prompt", None + return "internal:merge", None def _eoltype(data): "Guess the EOL type of a file"