merge-recursive: do not look at the index during recursive merge
[gitweb.git] / t / t4034 / php /
drwxr-xr-x   parent (dest: t/t4034; base: f309e8e768ec5de97e8ab3dcd223f32865176290)
-rw-r--r-- 2022 expect
-rw-r--r-- 241 post
-rw-r--r-- 234 pre