t / t4013 / diff.diff-tree_--pretty=oneline_-p_initialon commit git-merge: minor fix for no_trivial_merge_strategies. (de6f0de)
   1$ git diff-tree --pretty=oneline -p initial
   2$