merge-recursive: refuse to merge binary files
[gitweb.git] / contrib / vim /
drwxr-xr-x   parent (dest: contrib; base: 9f30855)
-rw-r--r-- 360 README
drwxr-xr-x - syntax