diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2016-12-02 11:29:10 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2016-12-02 11:29:10 +0200 |
| commit | 8b43f97e2cfce5ffea4f56377b5a0f7a8f268484 (patch) | |
| tree | c5e919151098371e0473078b666fde0dec2b9996 | |
| parent | c20035cd2bfc45bcecb52e51dea4ff8241d81b89 (diff) | |
| download | emacs-8b43f97e2cfce5ffea4f56377b5a0f7a8f268484.tar.gz | |
* lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046)
| -rw-r--r-- | lisp/vc/ediff-util.el | 2 |
1 files changed, 2 insertions, 0 deletions
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." |