merge-recursive: Improve handling of rename target vs. directory addition
[git] / contrib / vim /
drwxr-xr-x   ..
-rw-r--r-- 1229 README