merge-recursive: avoid spurious rename/rename conflict from dir renames
[gitweb.git] / contrib / workdir /
drwxr-xr-x   parent (dest: contrib; base: febb3a86098f853066c2623c2392f156710dd40f)
-rwxr-xr-x 2402 git-new-workdir