mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-07 06:22:32 -08:00
Code Issues Projects Releases Wiki Activity

(vc-parse-cvs-status): Grok new form of conflict message.

Browse source
This commit is contained in:
André Spiegel 1998-05-17 15:33:39 +00:00
parent a4370a7744
commit edad8a097f
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/vc-hooks.el
View file

@ -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 @@ 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))))))))))