t / t4013 / diff.diff-tree_--pretty=oneline_-p_initialon commit t3308: create a real ref directory/file conflict (f2515d9)
   1$ git diff-tree --pretty=oneline -p initial
   2$