merge-recursive: avoid spurious rename/rename conflict from dir renames
[gitweb.git] / block-sha1 /
drwxr-xr-x   parent (dest: ; base: febb3a86098f853066c2623c2392f156710dd40f)
-rw-r--r-- 7534 sha1.c
-rw-r--r-- 712 sha1.h