From b1cba2ee7701114a07a8c86c61d8d28eab2d54fb Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 24 Jul 1997 21:39:26 +0000 Subject: [PATCH] (ediff-update-diffs): Change error message. --- lisp/ediff-util.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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))) -- 2.39.5