1 files changed, 1 insertions, 1 deletions

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)))