t / t4013 / diff.diff-tree_-p_masteron commit merge-recursive: fix remaining directory rename + dirty overwrite cases (18797a3)
   1$ git diff-tree -p master
   2$