t / t4013 / diff.diff-tree_masteron commit t6042: Add tests for content issues with modify/rename/directory conflicts (ac6e839)
   1$ git diff-tree master
   2$