Changing font-lock color in SMerge mode

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 thi开发者_如何学Cs 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?

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.

I'm using a custom color theme [0], that I load in my .emacs. When I come across something that's ugly, I use M-x list-faces-display to find the offending faces. Then you just update your color theme accordingly.

(An example of my color theme is here [1])

0 - http://github.com/mattharrison/emacs-tango-theme

1 - http://panela.blog-city.com/python_and_emacs_2_color_themes.htm