git log --remerge-diff
You can also specific the commit hash to get more specific output. Will list all conflict resolution history for merges