diff options
| author | Richard M. Stallman | 1997-07-24 21:39:26 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-07-24 21:39:26 +0000 |
| commit | b1cba2ee7701114a07a8c86c61d8d28eab2d54fb (patch) | |
| tree | 6e9e5e66cd87ea010e02b26611f9a9fdc834eaa5 | |
| parent | 937a3875a463fc19cebdbd949f307b1412c4e011 (diff) | |
| download | emacs-b1cba2ee7701114a07a8c86c61d8d28eab2d54fb.tar.gz emacs-b1cba2ee7701114a07a8c86c61d8d28eab2d54fb.zip | |
(ediff-update-diffs): Change error message.
| -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." | |||
| 549 | (ediff-barf-if-not-control-buffer) | 549 | (ediff-barf-if-not-control-buffer) |
| 550 | (if (and (ediff-buffer-live-p ediff-ancestor-buffer) | 550 | (if (and (ediff-buffer-live-p ediff-ancestor-buffer) |
| 551 | (not (y-or-n-p "Recompute differences during merge, really? "))) | 551 | (not (y-or-n-p "Recompute differences during merge, really? "))) |
| 552 | (error "God forbid!")) | 552 | (error "Recomputation of differences cancelled")) |
| 553 | 553 | ||
| 554 | (let ((point-A (ediff-eval-in-buffer ediff-buffer-A (point))) | 554 | (let ((point-A (ediff-eval-in-buffer ediff-buffer-A (point))) |
| 555 | ;;(point-B (ediff-eval-in-buffer ediff-buffer-B (point))) | 555 | ;;(point-B (ediff-eval-in-buffer ediff-buffer-B (point))) |