t / t4013 / diff.diff-tree_-p_initialon commit Make cherry-pick use rerere for conflict resolution. (aa1a011)
   1$ git diff-tree -p initial
   2$