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