t / t4013 / diff.diff-tree_-p_masteron commit merge-recursive: Nuke rename/directory conflict detection (605c1bc)
   1$ git diff-tree -p master
   2$