t / t4013 / diff.diff-tree_--pretty_--patch-with-stat_initialon commit Make cherry-pick use rerere for conflict resolution. (aa1a011)
   1$ git diff-tree --pretty --patch-with-stat initial
   2$