t / t4013 / diff.diff_--name-status_dir2_diron commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1$ git diff --name-status dir2 dir
   2$