Fix a formatting error in git-merge.txt
[gitweb.git] / block-sha1 /
drwxr-xr-x   parent (dest: ; base: af77aee9cac51c2036e6019b4aebec2049f03e6b)
-rw-r--r-- 8584 sha1.c
-rw-r--r-- 692 sha1.h