merge-recursive: Create function for merging with branchname:file markers
[gitweb.git] / block-sha1 /
drwxr-xr-x   parent (dest: ; base: dac4741554e7672e69d1bc6b4f912cd16ad83b38)
-rw-r--r-- 8584 sha1.c
-rw-r--r-- 692 sha1.h