merge-recursive: add handling for rename/rename/add-dest/add-dest
[git] / contrib / vim /
drwxr-xr-x   ..
-rw-r--r-- 1229 README