Change font lock color in SMerge mode

Question

In Emacs 23.1, I open a file with conflict markers from a svn merge and therefore open it in SMerge mode. Conflicting text is highlighted in bright yellow. From what I could find, it's that the font color is set, right?

I want to change the highlight color in SMerge mode. What do I need to add to my .emacs file?

Answer 1

No need to mess with list-faces-displayor manually edit files. Put a dot on the color you hate, enter M-x customize-face, click ENT(default is correct) and follow the on-screen instructions.

Answer 2

[0], .emacs. -, , M-x list-faces-display, . .

( [1])

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

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