builtin/merge.c: fix a bug with trivial merges
[gitweb.git] / t / lib-gpg /
drwxr-xr-x   parent (dest: t; base: 40d71940b6a0dadb7873cce614992f1d71fcdfbd)
-rw-r--r-- 8506 keyring.gpg
-rw-r--r-- 210 ownertrust