merge script: handle many-way octopus
[gitweb.git] / contrib / workdir /
drwxr-xr-x   parent (dest: contrib; base: d9a680acf68caef16b5f316ed7917d8160d3578a)
-rwxr-xr-x 1889 git-new-workdir