t / t4013 / diff.diff_--no-index_--name-status_dir2_diron commit git-merge-recursive: learn to honor merge.conflictstyle (c236bcd)
   1$ git diff --no-index --name-status dir2 dir
   2A       dir/sub
   3$