t / t4013 / diff.diff-tree_-p_masteron commit merge-file: support -p and -q; fix compile warnings (fbe0b24)
   1$ git diff-tree -p master
   2$