unpack-trees: fix "read-tree -u --reset A B" with conflicted index
[gitweb.git] / block-sha1 /
drwxr-xr-x   parent (dest: ; base: b018ff6085)
-rw-r--r-- 8584 sha1.c
-rw-r--r-- 692 sha1.h