Merge branch 'jk/error-resolve-conflict-advice'
[gitweb.git] / block-sha1 /
drwxr-xr-x   parent (dest: ; base: d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7)
-rw-r--r-- 7534 sha1.c
-rw-r--r-- 692 sha1.h