t / t4013 / diff.diff-tree_--pretty_-p_initialon commit git-merge-recursive: learn to honor merge.conflictstyle (c236bcd)
   1$ git diff-tree --pretty -p initial
   2$