t / t4013 / diff.diff-tree_-p_masteron commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1$ git diff-tree -p master
   2$