diff --cc: fix display of symlink conflicts during a merge.