--- a/.emacs	Fri Apr 18 00:04:23 2008 +0300
+++ b/.emacs	Fri Apr 18 00:04:24 2008 +0300
@@ -650,7 +650,7 @@
   :group 'basic-faces)
 
 (defface my-conflict-face
-  '((t :background "yellow" :foreground "red" :weight bold))
+  '((t :background "pink" :foreground "red" :weight bold))
   "Font for showing conflicts."
   :group 'basic-faces)
 
@@ -660,6 +660,7 @@
      '(
        ("\t+" 0 'my-tab-face t)
        ("\\<\\(FIXME:?\\|XXX:?\\|TODO:?\\)\\>" 1 'my-todo-face t)
+       ("\\(=\\{7,\\}\\|<\\{7,\\}\\|>\\{7,\\}\\)" 1 'my-conflict-face t)
        ))))))
 
 ;; ----------------------------------------------------------------------