merge-recursive: handle addition of submodule on our side of history
[git] / t / t9154 /
drwxr-xr-x   ..
-rw-r--r-- 2934 svn.dump