t / t4013 / diff.diff_--name-status_dir2_diron commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1$ git diff --name-status dir2 dir
   2$