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