t / t4013 / diff.diff_--name-status_dir2_diron commit rerere: add documentation for conflict normalization (fb90dca)
   1$ git diff --name-status dir2 dir
   2$