merge-recursive: adjust to loosened "working file clobbered" check
[gitweb.git] / arm /
drwxr-xr-x   parent (dest: ; base: 65ac6e9)
-rw-r--r-- 1793 sha1.c
-rw-r--r-- 402 sha1.h
-rw-r--r-- 3555 sha1_arm.S