Mercurial > public > mercurial-scm > hg
comparison mercurial/filemerge.py @ 16256:c655e4acaa82
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 13 Mar 2012 16:29:13 -0500 |
parents | 1970e6f61009 c7eef052c9e3 |
children | 9a2cf955db84 |
comparison
equal
deleted
inserted
replaced
16253:17f179805297 | 16256:c655e4acaa82 |
---|---|
105 tools.append((None, "hgmerge")) # the old default, if found | 105 tools.append((None, "hgmerge")) # the old default, if found |
106 for p, t in tools: | 106 for p, t in tools: |
107 if check(t, None, symlink, binary): | 107 if check(t, None, symlink, binary): |
108 toolpath = _findtool(ui, t) | 108 toolpath = _findtool(ui, t) |
109 return (t, '"' + toolpath + '"') | 109 return (t, '"' + toolpath + '"') |
110 # internal merge as last resort | 110 |
111 return (not (symlink or binary) and "internal:merge" or None, None) | 111 # internal merge or prompt as last resort |
112 if symlink or binary: | |
113 return "internal:prompt", None | |
114 return "internal:merge", None | |
112 | 115 |
113 def _eoltype(data): | 116 def _eoltype(data): |
114 "Guess the EOL type of a file" | 117 "Guess the EOL type of a file" |
115 if '\0' in data: # binary | 118 if '\0' in data: # binary |
116 return None | 119 return None |