t / t4013 / diff.diff-tree_--pretty=oneline_initialon commit t6036: tests for criss-cross merges with various directory/file conflicts (827f2b7)
   1$ git diff-tree --pretty=oneline initial
   2$