merge-recursive: Improve handling of rename target vs. directory addition
[git] / t / t9700 /
drwxr-xr-x   ..
-rwxr-xr-x 5316 test.pl