merge: avoid "safer crlf" during recording of merge results
[git] / t / lib-gpg /
drwxr-xr-x   ..
-rw-r--r-- 8506 keyring.gpg
-rw-r--r-- 210 ownertrust