t / t4013 / diff.diff-tree_--pretty_--patch-with-raw_initialon commit git-revert with conflicts to behave as git-merge with conflicts (a9cb3c6)
   1$ git diff-tree --pretty --patch-with-raw initial
   2$