t / t5100 / msg0016--no-inbody-headerson commit t6044: new merge testcases for when index doesn't match HEAD (a6ee883)
   1Date: bogus
   2
   3and some content
   4