Clarify kind of conflict in merge-one-file helper
[gitweb.git] / mozilla-sha1 /
drwxr-xr-x   parent (dest: ; base: adfd55d51bff3bfcf17c3cd40d0689fb018c14cf)
-rw-r--r-- 4536 sha1.c
-rw-r--r-- 1895 sha1.h