Keep rename/rename conflicts of intermediate merges while doing recursive merge
[gitweb.git] / mozilla-sha1 /
drwxr-xr-x   parent (dest: ; base: a97e4075a16e0cbdf9c4aed736b5e762e035508b)
-rw-r--r-- 4498 sha1.c
-rw-r--r-- 1729 sha1.h