Mercurial > emacs

changeset 22112:c10e054e2cb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-parse-cvs-status): Grok new form of conflict message.
author André Spiegel <spiegel@gnu.org>
date Sun, 17 May 1998 15:33:39 +0000
parents 38f78542051a
children be43fb8acb62
files lisp/vc-hooks.el
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc-hooks.el	Sun May 17 13:20:26 1998 +0000
+++ b/lisp/vc-hooks.el	Sun May 17 15:33:39 1998 +0000
@@ -5,7 +5,7 @@
 ;; Author:     Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
 
-;; $Id: vc-hooks.el,v 1.108 1998/05/06 13:36:45 spiegel Exp rms $
+;; $Id: vc-hooks.el,v 1.109 1998/05/07 21:34:54 rms Exp spiegel $
 
 ;; This file is part of GNU Emacs.
 
@@ -338,7 +338,10 @@
               ((string-match "Needs Merge"         status) 'needs-merge)
               ((string-match "Needs \\(Checkout\\|Patch\\)" status) 
                'needs-checkout)
-              ((string-match "Unresolved Conflict" status) 'unresolved-conflict)
+              ((string-match "Unresolved Conflict" status) 
+	       'unresolved-conflict)
+	      ((string-match "File had conflicts on merge" status)
+	       'unresolved-conflict)
               ((string-match "Locally Added"       status) 'locally-added)
               ((string-match "New file!"           status) 'locally-added)
               (t 'unknown))))))))))