t / t4013 / diff.diff_--name-status_dir2_diron commit Try normalizing files to avoid delete/modify conflicts when merging (331a183)
   1$ git diff --name-status dir2 dir
   2$