t / t4013 / diff.diff-tree_--pretty=oneline_-p_initialon commit Try normalizing files to avoid delete/modify conflicts when merging (331a183)
   1$ git diff-tree --pretty=oneline -p initial
   2$