t / t4013 / diff.diff-tree_-p_masteron commit make union merge an xdl merge favor (cd1d61c)
   1$ git diff-tree -p master
   2$