How can I find out if there were conflicts when merging a branch and what shenanigans did the person have to do to resolve those conflicts?
git log -p seems to show empty diffs for all merge commits, regardless whether they have manual changes or not.