--- a/.emacs	Fri Apr 18 00:03:41 2008 +0300
+++ b/.emacs	Fri Apr 18 00:04:23 2008 +0300
@@ -619,7 +619,6 @@
       )
   )
 
-
 (if (file-exists-p (concat my-el-dir "/mercurial.el"))
     (require 'mercurial)
   )
@@ -650,6 +649,11 @@
   "Font for showing TODO words."
   :group 'basic-faces)
 
+(defface my-conflict-face
+  '((t :background "yellow" :foreground "red" :weight bold))
+  "Font for showing conflicts."
+  :group 'basic-faces)
+
 (add-hook 'font-lock-mode-hook (function (lambda ()
   (unless (or (eq 'diff-mode major-mode) (eq 'script-mode major-mode))
     (font-lock-add-keywords nil