t / t4013 / diff.diff-tree_-p_masteron commit Keep rename/rename conflicts of intermediate merges while doing recursive merge (a97e407)
   1$ git diff-tree -p master
   2$