t / t4013 / diff.diff_--name-status_dir2_diron commit merge-octopus: abort if index does not match HEAD (3ec62ad)
   1$ git diff --name-status dir2 dir
   2$