merge-recursive: Improve handling of rename target vs. directory addition
[gitweb.git] / t / t4034 / php /
drwxr-xr-x   parent (dest: t/t4034; base: 51931bf08e7de1f597d36bc2fd38b5310b6da7dd)
-rw-r--r-- 2022 expect
-rw-r--r-- 241 post
-rw-r--r-- 234 pre