Commit b1cba2ee authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

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

parent 937a3875
......@@ -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)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment