Merge branch 'fc/rerere-conflict-style' into maint
[gitweb.git] / block-sha1 /
drwxr-xr-x   parent (dest: ; base: ada8710e634b4f9f686bd0477bd92b272ec60801)
-rw-r--r-- 7534 sha1.c
-rw-r--r-- 692 sha1.h