t / t4013 / diff.diff-tree_--pretty_--patch-with-stat_initialon commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1$ git diff-tree --pretty --patch-with-stat initial
   2$