merge-recursive: do not rudely die on binary merge
[gitweb.git] / mozilla-sha1 /
drwxr-xr-x   parent (dest: ; base: b798671fa935492ce511766bc99fb26b2892499b)
-rw-r--r-- 4488 sha1.c
-rw-r--r-- 1720 sha1.h