merge-recursive: handle addition of submodule on our side of history
[git] / contrib / workdir /
drwxr-xr-x   ..
-rw-r--r-- 24 .gitattributes
-rwxr-xr-x 2402 git-new-workdir