Three-way merge: fix silly bug that made trivial merges not work
[gitweb.git] / mozilla-sha1 /
drwxr-xr-x   parent (dest: ; base: a76d74fb7146d1785cdefc58a91c50ab9acec775)
-rw-r--r-- 4486 sha1.c
-rw-r--r-- 1723 sha1.h