t / t4013 / diff.diff_--no-index_--name-status_--_dir2_diron commit t7405: verify 'merge --abort' works after submodule/path conflicts (587421e)
   1$ git diff --no-index --name-status -- dir2 dir
   2A       dir/sub
   3$