merge-one-file: make sure we do not mismerge symbolic links.
[gitweb.git] / Documentation / technical /
drwxr-xr-x   parent (dest: Documentation; base: 54dd99a1)
-rw-r--r-- 4246 trivial-merge.txt