| changeset 27040 | 1bde66b89bb2 |
| parent 27039 | d7517deedf86 |
| child 27041 | 0e330f59ef68 |
| 27039:d7517deedf86 | 27040:1bde66b89bb2 |
|---|---|
326 tool, toolpath, binary, symlink = toolconf |
326 tool, toolpath, binary, symlink = toolconf |
327 if symlink: |
327 if symlink: |
328 repo.ui.warn(_('warning: internal %s cannot merge symlinks ' |
328 repo.ui.warn(_('warning: internal %s cannot merge symlinks ' |
329 'for %s\n') % (tool, fcd.path())) |
329 'for %s\n') % (tool, fcd.path())) |
330 return False |
330 return False |
331 if fcd.isabsent() or fco.isabsent(): |
|
332 repo.ui.warn(_('warning: internal %s cannot merge change/delete ' |
|
333 'conflict for %s\n') % (tool, fcd.path())) |
|
334 return False |
|
331 return True |
335 return True |
332 |
336 |
333 def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode): |
337 def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode): |
334 """ |
338 """ |
335 Uses the internal non-interactive simple merge algorithm for merging |
339 Uses the internal non-interactive simple merge algorithm for merging |