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