From edad8a097fefd0334e5d9776145dbe3852cf87f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Spiegel?= Date: Sun, 17 May 1998 15:33:39 +0000 Subject: (vc-parse-cvs-status): Grok new form of conflict message. --- lisp/vc-hooks.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lisp/vc-hooks.el') diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 709e7014262..b829b44361a 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -5,7 +5,7 @@ ;; Author: Eric S. Raymond ;; Maintainer: Andre Spiegel -;; $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 @@ similarly for other version control systems." ((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)))))))))) -- cgit v1.2.1