[Emacs-diffs] emacs-25 8b43f97: * lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046)

[Eli Zaretskii]

branch: emacs-25
commit 8b43f97e2cfce5ffea4f56377b5a0f7a8f268484
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    * lisp/vc/ediff-util.el (ediff-janitor): Doc fix.  (Bug#25046)
---
 lisp/vc/ediff-util.el |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 5419d47..81ba0e4 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -2625,6 +2625,8 @@ temporarily reverses the meaning of this variable."
   "Kill buffers A, B, and, possibly, C, if these buffers aren't modified.
 In merge jobs, buffer C is not deleted here, but rather according to
 ediff-quit-merge-hook.
+ASK non-nil means ask the user whether to keep each unmodified buffer, unless
+KEEP-VARIANTS is non-nil, in which case buffers are killed unconditionally.
 A side effect of cleaning up may be that you should be careful when comparing
 the same buffer in two separate Ediff sessions: quitting one of them might
 delete this buffer in another session as well."