t / t4013 / diff.diff_--name-status_dir2_diron commit rerere: teach rerere to handle nested conflicts (4af3220)
   1$ git diff --name-status dir2 dir
   2$