t / t4013 / diff.diff-tree_initialon commit merge-recursive: avoid spurious rename/rename conflict from dir renames (6e7e027)
   1$ git diff-tree initial
   2$