t / t5100 / msg0016on commit merge: introduce merge.ff configuration variable (f23e8de)
   1and some content
   2