merge-recursive: refuse to merge binary files
[gitweb.git] / contrib / examples /
drwxr-xr-x   parent (dest: contrib; base: 9f30855d0ff5206e85e45f0307be9d18ffda41d3)
-rwxr-xr-x 609 git-gc.sh
-rwxr-xr-x 2715 git-resolve.sh