From: Eli Zaretskii Date: Fri, 2 Dec 2016 09:29:10 +0000 (+0200) Subject: * lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046) X-Git-Tag: emacs-25.1.91~40 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8b43f97;p=emacs.git * lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046) --- diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 5419d477810..81ba0e4a1f1 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."