merge-recursive: refuse to merge binary files
[gitweb.git] / arm /
drwxr-xr-x   parent (dest: ; base: 9f30855d0ff5206e85e45f0307be9d18ffda41d3)
-rw-r--r-- 1793 sha1.c
-rw-r--r-- 402 sha1.h
-rw-r--r-- 3552 sha1_arm.S