merge-recursive: switch from (oid,mode) pairs to a diff_filespec
[gitweb.git] / t / t0202 /
drwxr-xr-x   parent (dest: t; base: 8daec1df03de)
-rwxr-xr-x 3306 test.pl