merge-recursive: make "CONFLICT (rename/delete)" message show both paths
[gitweb.git] / t / lib-gpg /
drwxr-xr-x   parent (dest: t; base: b26d87f2da22a5970b15bebe588bcd6ccac98e9b)
-rw-r--r-- 8506 keyring.gpg
-rw-r--r-- 210 ownertrust