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