Andrew's git / gitweb.git / t/t4013/diff.diff_--no-index_--name-status_dir2_dir
?
t / t4013 / diff.diff_--no-index_--name-status_dir2_diron commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1$ git diff --no-index --name-status dir2 dir
   2A       dir/sub
   3$