t / t5100 / msg0016--no-inbody-headerson commit mergetool: honor diff.orderFile (57937f7)
   1Date: bogus
   2
   3and some content
   4