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