merge-one-file: make sure we do not mismerge symbolic links.