merge-recursive: switch from (oid,mode) pairs to a diff_filespec
[gitweb.git] / block-sha1 /
drwxr-xr-x   parent (dest: ; base: 8daec1df03de)
-rw-r--r-- 7534 sha1.c
-rw-r--r-- 712 sha1.h