Look at the hash (or tag) of the merge commit (the commit that has multiple parents) and do:
git diff hash hash^1 hash^2
It will output a 3 way-diff of the changes.
hash^
(or hash^1
) references the first parent commit of hash
hash^2
references the second parent commit of hash