Perhaps emacs is to blame for that.

Do you mean `git difftool --tool=emerge`, or are you thinking of something else?

vc-diff works pretty well.

smerge-mode or use the emerge diff tool setting