t / t4013 / diff.diff-tree_--pretty=oneline_-p_initialon commit traverse_trees(): handle D/F conflict case sanely (1ee2657)
   1$ git diff-tree --pretty=oneline -p initial
   2$