merge-recursive: switch from (oid,mode) pairs to a diff_filespec
[gitweb.git] / contrib / workdir /
drwxr-xr-x   parent (dest: contrib; base: 8daec1df03de)
-rwxr-xr-x 2402 git-new-workdir