t / t4013 / diff.diff-tree_-p_masteron commit merge-recursive: new function for better colliding conflict resolutions (37b65ce)
   1$ git diff-tree -p master
   2$