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