merge-recursive: switch from (oid,mode) pairs to a diff_filespec
[gitweb.git] / t / t5004 /
drwxr-xr-x   parent (dest: t; base: 8daec1df03de)
-rw-r--r-- 7373 big-pack.zip
-rw-r--r-- 10240 empty-with-pax-header.tar
-rw-r--r-- 62 empty.zip