t / t4013 / diff.diff-tree_--pretty=oneline_--patch-with-stat_initialon commit git notes merge: Manual conflict resolution, part 2/2 (6abb365)
   1$ git diff-tree --pretty=oneline --patch-with-stat initial
   2$