t / t4013 / diff.diff-tree_--pretty=oneline_-p_initialon commit t6036: add a failed conflict detection case with submodule add/add (a79968b)
   1$ git diff-tree --pretty=oneline -p initial
   2$