| changeset 26518 | a77679d0b887 |
| parent 26517 | d8463a743d7d |
| child 26519 | 48476c6129a2 |
| 26517:d8463a743d7d | 26518:a77679d0b887 |
|---|---|
229 return 1 # continue merging |
229 return 1 # continue merging |
230 |
230 |
231 def _symlinkcheck(repo, mynode, orig, fcd, fco, fca, toolconf): |
231 def _symlinkcheck(repo, mynode, orig, fcd, fco, fca, toolconf): |
232 tool, toolpath, binary, symlink = toolconf |
232 tool, toolpath, binary, symlink = toolconf |
233 if symlink: |
233 if symlink: |
234 repo.ui.warn(_('warning: internal :merge cannot merge symlinks ' |
234 repo.ui.warn(_('warning: internal %s cannot merge symlinks ' |
235 'for %s\n') % fcd.path()) |
235 'for %s\n') % (tool, fcd.path())) |
236 return False |
236 return False |
237 return True |
237 return True |
238 |
238 |
239 def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode): |
239 def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode): |
240 """ |
240 """ |