checkout: prevent losing staged changes with --merge
[gitweb.git] / t / lib-gpg /
drwxr-xr-x   parent (dest: t; base: 6eff409e8a760645ae5357d1e95e7e7ff3c04456)
-rw-r--r-- 212 gpgsm-gen-key.in
-rw-r--r-- 2652 gpgsm_cert.p12
-rw-r--r-- 11778 keyring.gpg
-rw-r--r-- 210 ownertrust