Show More
@@ -171,13 +171,15 b' def _ifail(repo, mynode, orig, fcd, fco,' | |||
|
171 | 171 | |
|
172 | 172 | def _premerge(repo, toolconf, files): |
|
173 | 173 | tool, toolpath, binary, symlink = toolconf |
|
174 | if symlink: | |
|
175 | return 1 | |
|
174 | 176 | a, b, c, back = files |
|
175 | 177 | |
|
176 | 178 | ui = repo.ui |
|
177 | 179 | |
|
178 | 180 | # do we attempt to simplemerge first? |
|
179 | 181 | try: |
|
180 |
premerge = _toolbool(ui, tool, "premerge", not |
|
|
182 | premerge = _toolbool(ui, tool, "premerge", not binary) | |
|
181 | 183 | except error.ConfigError: |
|
182 | 184 | premerge = _toolstr(ui, tool, "premerge").lower() |
|
183 | 185 | valid = 'keep'.split() |
General Comments 0
You need to be logged in to leave comments.
Login now