t / t4013 / diff.diff_--no-index_--name-status_--_dir2_diron commit git-add: no need for -f when resolving a conflict in already tracked path (6e4f981)
   1$ git diff --no-index --name-status -- dir2 dir
   2A       dir/sub
   3$