t / t4013 / diff.diff-tree_-p_masteron commit Merge branch 'jk/two-way-merge-corner-case-fix' into maint (4766036)
   1$ git diff-tree -p master
   2$