merge-options.txt: clarify meaning of various ff-related options
[git] / RelNotes
1 Documentation/RelNotes/2.22.1.txt