procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046)

Browse source
This commit is contained in:
Eli Zaretskii 2016-12-02 11:29:10 +02:00
parent c20035cd2b
commit 8b43f97e2c
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/vc/ediff-util.el
View file

@ -2625,6 +2625,8 @@ temporarily reverses the meaning of this variable."
"Kill buffers A, B, and, possibly, C, if these buffers aren't modified. "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 In merge jobs, buffer C is not deleted here, but rather according to
ediff-quit-merge-hook. 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 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 the same buffer in two separate Ediff sessions: quitting one of them might
delete this buffer in another session as well." delete this buffer in another session as well."