merge-one-file: make sure we do not mismerge symbolic links.
[git] / debian / compat
1 4