merge-recursive: switch from (oid,mode) pairs to a diff_filespec
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: 8daec1df03de7db13d5d551a8b54f32fc6021132)
-rw-r--r-- 90 expect
-rw-r--r-- 163 patch1.patch
-rw-r--r-- 112 patch2.patch
-rw-r--r-- 131 patch3.patch
-rw-r--r-- 112 patch4.patch
-rw-r--r-- 117 patch5.patch