merge-recursive: Improve handling of rename target vs. directory addition
[git] / t / t9601 /
drwxr-xr-x   ..
drwxr-xr-x - cvsroot