t / t5100 / msg0016on commit apply.c: fix whitespace-only mismerge (e294e89)
   1and some content
   2