t / t4013 / diff.diff-tree_-p_masteron commit t6036: add a failed conflict detection case with symlink modify/modify (c6d3dd5)
   1$ git diff-tree -p master
   2$