t / t5100 / msg0015on commit t6036: Test index and worktree state, not just that merge fails (c976260)
   1  - a list
   2  - of stuff