t / t4013 / diff.diff-tree_--pretty=oneline_initialon commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1$ git diff-tree --pretty=oneline initial
   2$