t / t5100 / msg0006on commit merge-options.txt: clarify meaning of various ff-related options (27fd1e4)
   1Here is a patch from A U Thor.
   2