Commit edad8a09 authored by André Spiegel's avatar André Spiegel
Browse files

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

parent a4370a77
......@@ -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)
((string-match "Unresolved Conflict" status) 'unresolved-conflict)
((string-match "Unresolved Conflict" status)
((string-match "File had conflicts on merge" status)
((string-match "Locally Added" status) 'locally-added)
((string-match "New file!" status) 'locally-added)
(t 'unknown))))))))))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment