merge-recursive: conflicting rename case.
[git/vmiklos.git] / mozilla-sha1 / 
tree530a0a83955897e9caa415668ff1fb24ddf714d6
drwxr-xr-x   ..
-rw-r--r-- 4498 sha1.c
-rw-r--r-- 1729 sha1.h