Merge leaves diff delimiters in parent file
Created originally on Bitbucket by cephiroth (Patrick)
The behavior for manual merges seems to have changes recently. When having to merge manually the file shown as parent1 in kdiff now contains both old and new version data delimited by "<<<<<<< local" or the like (local, other, dest, source) as if merging on the console. This makes merging much harder as you cannot simply select from parent1 but have to remove the artifacts manually.