t / t5100 / msg0001on commit t6036: Test index and worktree state, not just that merge fails (c976260)
   1Here is a patch from A U Thor.
   2