t / t4013 / diff.diff-tree_-p_initialon commit rerere: teach rerere to handle nested conflicts (4af3220)
   1$ git diff-tree -p initial
   2$