t / t4013 / diff.diff-tree_-p_masteron commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1$ git diff-tree -p master
   2$