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