t6036: add a failed conflict detection case with submodule modify/modify
[gitweb.git] / t / lib-gpg /
drwxr-xr-x   parent (dest: t; base: d4d17180808437fd732a9d14388657b8f609ad4a)
-rw-r--r-- 8506 keyring.gpg
-rw-r--r-- 210 ownertrust