merge-recursive: switch from (oid,mode) pairs to a diff_filespec
[gitweb.git] / t / t3206 /
drwxr-xr-x   parent (dest: t; base: 8daec1df03de)
-rw-r--r-- 7534 history.export