t / t4013 / diff.diff-tree_--pretty=oneline_-p_initialon commit Keep rename/rename conflicts of intermediate merges while doing recursive merge (a97e407)
   1$ git diff-tree --pretty=oneline -p initial
   2$