t / t4013 / diff.diff-tree_-p_masteron commit Merge branch 'jc/maint-add-u-remove-conflicted' (f39e4cf)
   1$ git diff-tree -p master
   2$