t / t5100 / msg0016on commit t6036: Test index and worktree state, not just that merge fails (c976260)
   1and some content
   2