t / t4013 / diff.diff_--name-status_dir2_diron commit traverse_trees(): handle D/F conflict case sanely (1ee2657)
   1$ git diff --name-status dir2 dir
   2$