t6044: new merge testcases for when index doesn't match HEAD
[gitweb.git] / t / t4034 / php /
drwxr-xr-x   parent (dest: t/t4034; base: a6ee883b8eb5)
-rw-r--r-- 2022 expect
-rw-r--r-- 241 post
-rw-r--r-- 234 pre