From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 12 Nov 2000 16:52:53 +0000 (+0000)
Subject: (cvs-fi-conflict-face): New var.
X-Git-Tag: emacs-pretest-21.0.90~110
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=539211583477e45d265740af64b14f4c8410131c;p=emacs.git

(cvs-fi-conflict-face): New var.
---

diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el
index 623e24a7ba5..a1e09a70e0d 100644
--- a/lisp/pcvs-info.el
+++ b/lisp/pcvs-info.el
@@ -5,7 +5,7 @@
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
 ;; Version: $Name:  $
-;; Revision: $Id: pcvs-info.el,v 1.2 2000/03/22 02:56:52 monnier Exp $
+;; Revision: $Id: pcvs-info.el,v 1.3 2000/06/12 04:37:50 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -130,6 +130,7 @@ to confuse some users sometimes."
 
 (defvar cvs-fi-up-to-date-face 'cvs-handled-face)
 (defvar cvs-fi-unknown-face 'cvs-unknown-face)
+(defvar cvs-fi-conflict-face 'font-lock-warning-face)
 
 ;; There is normally no need to alter the following variable, but if
 ;; your site has installed CVS in a non-standard way you might have