t / t4013 / diff.diff-tree_-p_masteron commit t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts (c696606)
   1$ git diff-tree -p master
   2$