t / t5100 / msg0015on commit t6044: new merge testcases for when index doesn't match HEAD (a6ee883)
   1  - a list
   2  - of stuff