Commit 051848e4 authored by Andreas Schwab's avatar Andreas Schwab
Browse files

(vc-backend-merge-news): Fix regexp to also match P marker

from cvs update.
parent 55ac4d11
......@@ -5,7 +5,7 @@
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
;; $Id: vc.el,v 1.249 1999/06/15 17:40:09 kwzh Exp $
;; $Id: vc.el,v 1.250 1999/06/30 07:16:14 spiegel Exp schwab $
;; This file is part of GNU Emacs.
......@@ -2995,7 +2995,7 @@ THRESHOLD, nil otherwise"
(vc-file-setprop file 'vc-workfile-version (match-string 1)))
;; get file status
(if (re-search-forward
(concat "^\\(\\([CMU]\\) \\)?"
(concat "^\\(\\([CMUP]\\) \\)?"
(regexp-quote (file-name-nondirectory file))
"\\( already contains the differences between \\)?")
nil t)
......
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