diff options
| author | Richard M. Stallman <rms@gnu.org> | 1997-07-24 21:39:26 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1997-07-24 21:39:26 +0000 |
| commit | 5df233be883a08d9807669bbf060e340d260ea18 (patch) | |
| tree | be001524ea12ab6ea749146b75bc137e8f4382e4 /lisp/ediff-util.el | |
| parent | eb6165ba606db8f3461eb9101f1900daabfe3d99 (diff) | |
| download | emacs-5df233be883a08d9807669bbf060e340d260ea18.tar.gz | |
(ediff-update-diffs): Change error message.
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 2 |
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))) |