How do you see / show a git merge conflict resolution that was done, given a merge commit SHA1?

Question

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 c

Answer 1

Slight bikeshed: you could use diff3 or kdiff3 to see the merge in reverse, particularly if it was a (git style) 'evil' merge, where a secondary change was introduced to resolve the conflict. (watch out for an exploding head trying to see how it 'backs out' the changes;-)

Obviously the 'base' commit would be the merged commit.