diff options
| author | Dave Love <fx@gnu.org> | 1998-10-30 19:11:08 +0000 |
|---|---|---|
| committer | Dave Love <fx@gnu.org> | 1998-10-30 19:11:08 +0000 |
| commit | 927d7566ff20dd6a550be7dec9ecd4429bcb99d5 (patch) | |
| tree | 9fb120b9dff5e4d79b3f243f965cfaa2c36b379e | |
| parent | 3476e1595542523a3c26ba719b49eea6249d62dc (diff) | |
| download | emacs-927d7566ff20dd6a550be7dec9ecd4429bcb99d5.tar.gz | |
(vc-backend-merge-news): Check for "P" output.
| -rw-r--r-- | lisp/vc.el | 3 |
1 files changed, 2 insertions, 1 deletions
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)) |