t / t4013 / diff.diff_--no-index_--name-status_dir2_diron commit Aggressive three-way merge: fix D/F case (cee2d6a)
   1$ git diff --no-index --name-status dir2 dir
   2A       dir/sub
   3$