t / t4013 / diff.diff-tree_--patch-with-stat_initialon commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1$ git diff-tree --patch-with-stat initial
   2$