[Emacs-diffs] Changes to emacs/lisp/pcvs-parse.el

[Stefan Monnier]

Index: emacs/lisp/pcvs-parse.el
diff -c emacs/lisp/pcvs-parse.el:1.10 emacs/lisp/pcvs-parse.el:1.11
*** emacs/lisp/pcvs-parse.el:1.10       Mon Sep 24 12:39:23 2001
--- emacs/lisp/pcvs-parse.el    Sun Mar 17 15:48:14 2002
***************
*** 4,10 ****
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: pcl-cvs
! ;; Revision: $Id: pcvs-parse.el,v 1.10 2001/09/24 16:39:23 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 4,10 ----
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: pcl-cvs
! ;; Revision: $Id: pcvs-parse.el,v 1.11 2002/03/17 20:48:14 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 251,257 ****
  
       ;; A special cvs message
       (and
!       (cvs-match "cvs[.ex]* [a-z]+: ")
        (cvs-or
  
         ;; CVS is descending a subdirectory
--- 251,258 ----
  
       ;; A special cvs message
       (and
!       (let ((case-fold-search t))
!       (cvs-match "cvs[.a-z]* [a-z]+: "))
        (cvs-or
  
         ;; CVS is descending a subdirectory
***************
*** 435,440 ****
--- 436,442 ----
                 (type (if nofile 'MISSING 'NEED-UPDATE)))
        (cvs-match "Up-to-date$"
                 (type (if nofile '(UP-TO-DATE . REMOVED) 'UP-TO-DATE)))
+       (cvs-match "File had conflicts on merge$" (type 'MODIFIED))
        (cvs-match ".*[Cc]onflict.*$"   (type 'CONFLICT))
        (cvs-match "Locally Added$"             (type 'ADDED))
        (cvs-match "Locally Removed$"   (type 'REMOVED))