merge-options.txt: clarify meaning of various ff-related options
[git] / t / t5100 / msg0011
1 Here comes a commit log message, and
2 its second line is here.