t / t4013 / diff.diff_--name-status_dir2_diron commit t6036: Test index and worktree state, not just that merge fails (c976260)
   1$ git diff --name-status dir2 dir
   2$