t / t4013 / diff.diff_--name-status_dir2_diron commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1$ git diff --name-status dir2 dir
   2$