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