merge-recursive: avoid spurious rename/rename conflict from dir renames
[gitweb.git] / t / lib-gpg /
drwxr-xr-x   parent (dest: t; base: febb3a86098f853066c2623c2392f156710dd40f)
-rw-r--r-- 8506 keyring.gpg
-rw-r--r-- 210 ownertrust