merge-recursive: add handling for rename/rename/add-dest/add-dest
[git] / contrib / workdir /
drwxr-xr-x   ..
-rwxr-xr-x 1886 git-new-workdir