t / t4013 / diff.diff_--name-status_dir2_diron commit merge-recursive: avoid incorporating uncommitted changes in a merge (65170c0)
   1$ git diff --name-status dir2 dir
   2$