merge-recursive: new function for better colliding conflict resolutions
[gitweb.git] / t / lib-gpg /
drwxr-xr-x   parent (dest: t; base: 37b65ce36bc8f79b5e8cf6f3addf586bd72f3352)
-rw-r--r-- 212 gpgsm-gen-key.in
-rw-r--r-- 2652 gpgsm_cert.p12
-rw-r--r-- 8506 keyring.gpg
-rw-r--r-- 210 ownertrust