[junke]

smerge-refine is one keybinding I always use to highlight changes in 3-way diffs between base/mine, base/theirs, mine/theirs. The only problem is knowing what mine and theirs mean sometimes.

[aulin]

Also magit-ediff ('e' in any merge conflict) is great and maybe a little more intuitive than smerge