cherry-pick/revert: add scissors line on merge conflict
[git] / sha256 /
drwxr-xr-x   ..
drwxr-xr-x - block
-rw-r--r-- 727 gcrypt.h