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

; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. (Bug#25046)

Browse source
This commit is contained in:
Eli Zaretskii 2016-12-02 16:35:16 +02:00
parent 8b43f97e2c
commit ba2847f5a5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2626,7 +2626,7 @@ temporarily reverses the meaning of this variable."
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 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. KEEP-VARIANTS is non-nil, in which case buffers are never killed.
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."