t / t4013 / diff.diff-tree_-p_initialon commit t7405: verify 'merge --abort' works after submodule/path conflicts (587421e)
   1$ git diff-tree -p initial
   2$