t / t5100 / msg0016on commit git-merge-one-file: style cleanup (333ea38)
   1and some content
   2