merge-recursive: switch from (oid,mode) pairs to a diff_filespec
[gitweb.git] / t / t9603 / cvsroot / module /
drwxr-xr-x   parent (dest: t/t9603/cvsroot; base: 8daec1df03de)
-rw-r--r-- 589 a,v
-rw-r--r-- 703 b,v