merge-recursive: make sure when we say we abort that we actually abort
[gitweb.git] / t / t4034 / php /
drwxr-xr-x   parent (dest: t/t4034; base: 92702392cefdbd66ca593fa909540230ef9e005e)
-rw-r--r-- 2022 expect
-rw-r--r-- 241 post
-rw-r--r-- 234 pre