title: How do you see / show a git merge conflict resolution that was done, given a merge commit SHA1?
body: <p>When you resolve a conflict, then stage the changes, then do a git diff, it shows you two columns of +'s and -'s, one for "ours" and one for "theirs".  Given a merge commit in a repo's git history, how do I see that resolution, which was done by someone else?  In other instances, I've seen it before (in gitk, I think), but I can't seem to determine it for this SHA1 that I have.</p>