diff options
| author | Eli Zaretskii | 2016-12-02 16:35:16 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2016-12-02 16:35:16 +0200 |
| commit | ba2847f5a5c3a34274d564584ce6e1d1fbae6e85 (patch) | |
| tree | 5277334c195413f0251637691ccb9a2267c2951b | |
| parent | 8b43f97e2cfce5ffea4f56377b5a0f7a8f268484 (diff) | |
| download | emacs-ba2847f5a5c3a34274d564584ce6e1d1fbae6e85.tar.gz emacs-ba2847f5a5c3a34274d564584ce6e1d1fbae6e85.zip | |
; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. (Bug#25046)
| -rw-r--r-- | lisp/vc/ediff-util.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 81ba0e4a1f1..10b84fa8851 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el | |||
| @@ -2626,7 +2626,7 @@ temporarily reverses the meaning of this variable." | |||
| 2626 | In merge jobs, buffer C is not deleted here, but rather according to | 2626 | In merge jobs, buffer C is not deleted here, but rather according to |
| 2627 | ediff-quit-merge-hook. | 2627 | ediff-quit-merge-hook. |
| 2628 | ASK non-nil means ask the user whether to keep each unmodified buffer, unless | 2628 | ASK non-nil means ask the user whether to keep each unmodified buffer, unless |
| 2629 | KEEP-VARIANTS is non-nil, in which case buffers are killed unconditionally. | 2629 | KEEP-VARIANTS is non-nil, in which case buffers are never killed. |
| 2630 | A side effect of cleaning up may be that you should be careful when comparing | 2630 | A side effect of cleaning up may be that you should be careful when comparing |
| 2631 | the same buffer in two separate Ediff sessions: quitting one of them might | 2631 | the same buffer in two separate Ediff sessions: quitting one of them might |
| 2632 | delete this buffer in another session as well." | 2632 | delete this buffer in another session as well." |