t / t5100 / msg0017on commit merge-options.txt: clarify meaning of various ff-related options (27fd1e4)
   1New content here
   2