t / t5100 / msg0016on commit cherry-pick: add tests for new --ff option (b5c1a28)
   1and some content
   2