t / t4013 / diff.diff-tree_-p_masteron commit t6042: Ensure rename/rename conflicts leave index and workdir in sane state (f0b75fc)
   1$ git diff-tree -p master
   2$