merge-recursive: handle addition of submodule on our side of history
[git] / t / lib-gpg /
drwxr-xr-x   ..
-rw-r--r-- 8506 keyring.gpg
-rw-r--r-- 210 ownertrust