merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
[git] / contrib / workdir /
drwxr-xr-x   ..
-rwxr-xr-x 1886 git-new-workdir