t / t4013 / diff.diff_--no-index_--name-status_--_dir2_diron commit t6036: add a failed conflict detection case with submodule add/add (a79968b)
   1$ git diff --no-index --name-status -- dir2 dir
   2A       dir/sub
   3$