Mercurial > emacs

changeset 18953:47924b18d95c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(ediff-update-diffs): Change error message.
author Richard M. Stallman <rms@gnu.org>
date Thu, 24 Jul 1997 21:39:26 +0000
parents 4e695c86585c
children c247e7c26139
files lisp/ediff-util.el
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ediff-util.el	Thu Jul 24 21:29:24 1997 +0000
+++ b/lisp/ediff-util.el	Thu Jul 24 21:39:26 1997 +0000
@@ -549,7 +549,7 @@
   (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)))