[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 ba2847f: ; * lisp/vc/ediff-util.el (ediff-janitor
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 ba2847f: ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. (Bug#25046) |
Date: |
Fri, 2 Dec 2016 14:35:53 +0000 (UTC) |
branch: emacs-25
commit ba2847f5a5c3a34274d564584ce6e1d1fbae6e85
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. (Bug#25046)
---
lisp/vc/ediff-util.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 81ba0e4..10b84fa 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -2626,7 +2626,7 @@ temporarily reverses the meaning of this variable."
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.
+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
the same buffer in two separate Ediff sessions: quitting one of them might
delete this buffer in another session as well."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 ba2847f: ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. (Bug#25046),
Eli Zaretskii <=