merge-options.txt: clarify meaning of various ff-related options
[git] / t / t5100 / msg0016
1 and some content
2