t / t4013 / diff.diff_--name-status_dir2_diron commit apply.c: fix whitespace-only mismerge (e294e89)
   1$ git diff --name-status dir2 dir
   2$