t / t4013 / diff.diff_--name-status_dir2_diron commit Merge branch 'en/d-f-conflict-fix' (9f44723)
   1$ git diff --name-status dir2 dir
   2$