t / t4013 / diff.diff_--name-status_dir2_diron commit Make cherry-pick use rerere for conflict resolution. (aa1a011)
   1$ git diff --name-status dir2 dir
   2$