t / t5100 / msg0009on commit merge-options.txt: clarify meaning of various ff-related options (27fd1e4)
   1This is to fix diff-format documentation.
   2