t / t4013 / diff.diff-tree_-p_masteron commit Try normalizing files to avoid delete/modify conflicts when merging (331a183)
   1$ git diff-tree -p master
   2$