Merge of type-change (data->symlink) and data-change (data->data) handled incorrectly

[Peaker]

When a file was changed to a symlink in one branch, and modified in another, the merge creates a conflicted state with the data change and no conflict markers, similarly to delete/modify conflict.

Git does not show the base nor the symlink to the poor user.

In this situation, git-mediate considers the modified file without conflict markers to be a resolution of the conflict, and just uses "git add" on it incorrectly.