Try normalizing files to avoid delete/modify conflicts when merging
[gitweb.git] / block-sha1 /
drwxr-xr-x   parent (dest: ; base: 331a1838b)
-rw-r--r-- 8539 sha1.c
-rw-r--r-- 692 sha1.h