merge & sequencer: turn "Conflicts:" hint into a comment
[gitweb.git] / block-sha1 /
drwxr-xr-x   parent (dest: ; base: 261f315b)
-rw-r--r-- 8611 sha1.c
-rw-r--r-- 692 sha1.h