merge-recursive: refuse to merge binary files
[gitweb.git] / contrib / workdir /
drwxr-xr-x   parent (dest: contrib; base: 9f30855)
-rwxr-xr-x 1411 git-new-workdir