t / t5100 / msg0016on commit t6044: new merge testcases for when index doesn't match HEAD (a6ee883)
   1and some content
   2