t / t4013 / diff.diff_--no-index_dir_dir3on commit traverse_trees(): handle D/F conflict case sanely (1ee2657)
   1$ git diff --no-index dir dir3
   2$