Mercurial > emacs
comparison lisp/ediff-init.el @ 75184:efbcec64e69d
(ediff-autostore-merges): Doc fix.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Wed, 10 Jan 2007 15:24:06 +0000 |
| parents | 6169b51037af |
| children | e3694f1cb928 |
comparison
equal
deleted
inserted
replaced
| 75183:648fbf434415 | 75184:efbcec64e69d |
|---|---|
| 1408 ;; if nil, this silences some messages | 1408 ;; if nil, this silences some messages |
| 1409 (defconst ediff-verbose-p t) | 1409 (defconst ediff-verbose-p t) |
| 1410 | 1410 |
| 1411 (defcustom ediff-autostore-merges 'group-jobs-only | 1411 (defcustom ediff-autostore-merges 'group-jobs-only |
| 1412 "*Save the results of merge jobs automatically. | 1412 "*Save the results of merge jobs automatically. |
| 1413 nil means don't save automatically. t means always save. Anything else | 1413 With value nil, don't save automatically. With value t, always |
| 1414 means save automatically only if the merge job is part of a group of jobs, such | 1414 save. Anything else means save automatically only if the merge |
| 1415 as `ediff-merge-directory' or `ediff-merge-directory-revisions'." | 1415 job is part of a group of jobs, such as `ediff-merge-directory' |
| 1416 or `ediff-merge-directory-revisions'." | |
| 1416 :type '(choice (const nil) (const t) (const group-jobs-only)) | 1417 :type '(choice (const nil) (const t) (const group-jobs-only)) |
| 1417 :group 'ediff-merge) | 1418 :group 'ediff-merge) |
| 1418 (make-variable-buffer-local 'ediff-autostore-merges) | 1419 (make-variable-buffer-local 'ediff-autostore-merges) |
| 1419 | 1420 |
| 1420 ;; file where the result of the merge is to be saved. used internally | 1421 ;; file where the result of the merge is to be saved. used internally |