merge-recursive: switch from (oid,mode) pairs to a diff_filespec
[gitweb.git] / t / t4256 / 1 /
drwxr-xr-x   parent (dest: t/t4256; base: 8daec1df03de)
-rw-r--r-- 28374 mailinfo.c
-rw-r--r-- 26987 mailinfo.c.orig
-rw-r--r-- 3381 patch