merge-options.txt: clarify meaning of various ff-related options
[git] / t / t5801 /
drwxr-xr-x   ..
-rwxr-xr-x 3075 git-remote-testgit