Mercurial > emacs
changeset 23592:43a9efaf1ee2
(vc-backend-merge-news): Check for "P" output.
| author | Dave Love <fx@gnu.org> |
|---|---|
| date | Fri, 30 Oct 1998 19:11:08 +0000 |
| parents | 9487b796b92c |
| children | 594ed104120c |
| files | lisp/vc.el |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc.el Fri Oct 30 19:07:09 1998 +0000 +++ b/lisp/vc.el Fri Oct 30 19:11:08 1998 +0000 @@ -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 @@ (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))