merge-options.txt: clarify meaning of various ff-related options
[git] / sha256 /
drwxr-xr-x   ..
drwxr-xr-x - block
-rw-r--r-- 727 gcrypt.h