t / t4013 / diff.diff-tree_--pretty=oneline_--patch-with-stat_initialon commit merge-recursive: new function for better colliding conflict resolutions (37b65ce)
   1$ git diff-tree --pretty=oneline --patch-with-stat initial
   2$