t / t5100 / msg0009on commit t6036: Test index and worktree state, not just that merge fails (c976260)
   1This is to fix diff-format documentation.
   2