590 |
Actually, Ediff restores the scope of visibility that existed at startup.") |
Actually, Ediff restores the scope of visibility that existed at startup.") |
591 |
|
|
592 |
(defcustom ediff-keep-variants t |
(defcustom ediff-keep-variants t |
593 |
"*nil means that non-modified variant buffers should be removed at the end of the session after some interrogation. |
"*nil means prompt to remove unmodified buffers A/B/C at session end. |
594 |
Supplying a prefix argument to the quit command `q' temporarily reverses the |
Supplying a prefix argument to the quit command `q' temporarily reverses the |
595 |
meaning of this variable." |
meaning of this variable." |
596 |
:type 'boolean |
:type 'boolean |
1241 |
|
|
1242 |
(defcustom ediff-autostore-merges 'group-jobs-only |
(defcustom ediff-autostore-merges 'group-jobs-only |
1243 |
"*Save the results of merge jobs automatically. |
"*Save the results of merge jobs automatically. |
1244 |
nil means don't save automatically. t means always save. Anything but nil or t |
nil means don't save automatically. t means always save. Anything else |
1245 |
means save automatically only if the merge job is part of a group of jobs, such |
means save automatically only if the merge job is part of a group of jobs, such |
1246 |
as `ediff-merge-directory' or `ediff-merge-directory-revisions'." |
as `ediff-merge-directory' or `ediff-merge-directory-revisions'." |
1247 |
:type '(choice (const nil) (const t) (const group-jobs-only)) |
:type '(choice (const nil) (const t) (const group-jobs-only)) |