merge-recursive: don't segfault while handling rename clashes
[gitweb.git] / contrib / workdir /
drwxr-xr-x   parent (dest: contrib; base: c94736a)
-rwxr-xr-x 1889 git-new-workdir