t / t5100 / msg0017on commit git-merge-one-file: style cleanup (333ea38)
   1New content here
   2