aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc/ediff-diff.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/vc/ediff-diff.el')
-rw-r--r--lisp/vc/ediff-diff.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index ded82c41c9b..b957bdce4f7 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -340,7 +340,7 @@ one optional arguments, diff-number to refine.")
340 (ediff-skip-unsuitable-frames) 340 (ediff-skip-unsuitable-frames)
341 (switch-to-buffer error-buf) 341 (switch-to-buffer error-buf)
342 (ediff-kill-buffer-carefully ctl-buf) 342 (ediff-kill-buffer-carefully ctl-buf)
343 (error "Errors in diff output. Diff output is in %S" diff-buff)))) 343 (user-error "Errors in diff output. Diff output is in %S" diff-buff))))
344 344
345;; BOUNDS specifies visibility bounds to use. 345;; BOUNDS specifies visibility bounds to use.
346;; WORD-MODE tells whether we are in the word-mode or not. 346;; WORD-MODE tells whether we are in the word-mode or not.