diff --cc: fix display of symlink conflicts during a merge.
[gitweb.git] / mozilla-sha1 /
drwxr-xr-x   parent (dest: ; base: 4fc970c43884e6215c13d6944a2def1eb2134ed5)
-rw-r--r-- 4498 sha1.c
-rw-r--r-- 1729 sha1.h