merge-one-file: make sure we do not mismerge symbolic links.
[git] / Documentation / technical /
drwxr-xr-x   ..
-rw-r--r-- 4246 trivial-merge.txt