*** empty log message ***

[bpt/emacs.git] / lisp / pcvs-info.el

diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el
index 623e24a..ba17247 100644 (file)
--- a/lisp/pcvs-info.el
+++ b/lisp/pcvs-info.el
@@ -1,11 +1,10 @@
-;;; pcvs-info.el --- Internal representation of a fileinfo entry
+;;; pcvs-info.el --- internal representation of a fileinfo entry
 
-;; Copyright (C) 1991-2000  Free Software Foundation, Inc.
+;; Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000  Free Software Foundation, Inc.
 
 ;; 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.6 2000/12/18 03:17:31 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -130,6 +129,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
@@ -477,4 +477,4 @@ DIR can also be a file."
 
 (provide 'pcvs-info)
 
-;;; pcl-cvs-info.el ends here
+;;; pcvs-info.el ends here