merge-options.txt: clarify meaning of various ff-related options
[git] / t / t9603 /
drwxr-xr-x   ..
drwxr-xr-x - cvsroot