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