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