merge-recursive: switch from (oid,mode) pairs to a diff_filespec
[gitweb.git] / t / t4034 / matlab /
drwxr-xr-x   parent (dest: t/t4034; base: 8daec1df03de7db13d5d551a8b54f32fc6021132)
-rw-r--r-- 1242 expect
-rw-r--r-- 134 post
-rw-r--r-- 134 pre