merge-recursive: remove ren[12]_other fields from rename_conflict_info
[gitweb.git] / block-sha1 /
drwxr-xr-x   parent (dest: ; base: 3f9c92ec99222515c6ebac1dc12d0bc3a6d4ae08)
-rw-r--r-- 7534 sha1.c
-rw-r--r-- 712 sha1.h