From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 24 Jul 1997 21:39:26 +0000 (+0000)
Subject: (ediff-update-diffs): Change error message.
X-Git-Tag: emacs-20.1~993
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b1cba2ee7701114a07a8c86c61d8d28eab2d54fb;p=emacs.git

(ediff-update-diffs): Change error message.
---

diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index fbd5808726a..a87e4549648 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -549,7 +549,7 @@ if necessary."
   (ediff-barf-if-not-control-buffer)
   (if (and (ediff-buffer-live-p ediff-ancestor-buffer)
 	   (not (y-or-n-p "Recompute differences during merge, really? ")))
-      (error "God forbid!"))
+      (error "Recomputation of differences cancelled"))
       
   (let ((point-A (ediff-eval-in-buffer ediff-buffer-A (point)))
 	;;(point-B (ediff-eval-in-buffer ediff-buffer-B (point)))