t / t5100 / msg0001on commit git-merge-one-file: style cleanup (333ea38)
   1Here is a patch from A U Thor.
   2