Changing font-lock color in SMerge mode

Question

In Emacs 23.1 I'm opening up a file with conflict markers from a svn merge and consequently it opens it up in SMerge mode. The conflicted text is highlighted in bright yellow. From what I could find this is whatever the font-lock color is set to, correct?

I'd like to change the highlight color in SMerge mode. What would I need to add to my .emacs file?

Answer 1

There is no need to mess with list-faces-display or manual file editing. Put the point on the color you hate, type M-x customize-face, press ENT (the default is correct), and follow the on-screen instructions.