From: Dave Love <fx@gnu.org>
Date: Fri, 30 Oct 1998 19:11:08 +0000 (+0000)
Subject: (vc-backend-merge-news): Check for "P" output.
X-Git-Tag: emacs-20.4~1357
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=927d7566ff20dd6a550be7dec9ecd4429bcb99d5;p=emacs.git

(vc-backend-merge-news): Check for "P" output.
---

diff --git a/lisp/vc.el b/lisp/vc.el
index 5b4309ad26e..e41dfd95b4d 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -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.236 1998/08/04 13:14:41 spiegel Exp fx $
+;; $Id: vc.el,v 1.237 1998/09/10 21:50:05 fx Exp fx $
 
 ;; This file is part of GNU Emacs.
 
@@ -2940,6 +2940,7 @@ THRESHOLD, nil otherwise"
              (cond 
               ;; Merge successful, we are in sync with repository now
               ((or (string= (match-string 2) "U")
+		   (string= (match-string 2) "P")
 		   ;; Special case: file contents in sync with
 		   ;; repository anyhow:
 		   (match-string 3))