equal
deleted
inserted
replaced
206 Uses the internal non-interactive simple merge algorithm for merging |
206 Uses the internal non-interactive simple merge algorithm for merging |
207 files. It will fail if there are any conflicts and leave markers in |
207 files. It will fail if there are any conflicts and leave markers in |
208 the partially merged file.""" |
208 the partially merged file.""" |
209 tool, toolpath, binary, symlink = toolconf |
209 tool, toolpath, binary, symlink = toolconf |
210 if symlink: |
210 if symlink: |
|
211 repo.ui.warn(_('warning: internal:merge cannot merge symlinks ' |
|
212 'for %s\n') % fcd.path()) |
211 return False, 1 |
213 return False, 1 |
212 |
214 |
213 r = _premerge(repo, toolconf, files) |
215 r = _premerge(repo, toolconf, files) |
214 if r: |
216 if r: |
215 a, b, c, back = files |
217 a, b, c, back = files |