t / t4013 / diff.diff-tree_-r_--abbrev=4_initialon commit traverse_trees(): handle D/F conflict case sanely (1ee2657)
   1$ git diff-tree -r --abbrev=4 initial
   2$