t / t4013 / diff.diff-tree_-p_masteron commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1$ git diff-tree -p master
   2$