t / t4013 / diff.diff-tree_-p_masteron commit Merge branch 'jk/add-p-skip-conflicts' (3c52400)
   1$ git diff-tree -p master
   2$