t / t4013 / diff.diff-tree_-p_masteron commit merge-recursive: avoid spurious rename/rename conflict from dir renames (febb3a8)
   1$ git diff-tree -p master
   2$