t / t4013 / diff.diff-tree_-p_masteron commit Further merging in preparation for 1.7.12.1 (e70d163)
   1$ git diff-tree -p master
   2$