[throwaway81523]

Yeah I know I'm an emacs zealot, but emerge works fine for me.

[gnufx]

And so you should be. Smerge is a useful addition, including as a find-file hook for resolving conflicts.