Mercurial > emacs
changeset 75184:efbcec64e69d
(ediff-autostore-merges): Doc fix.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Wed, 10 Jan 2007 15:24:06 +0000 |
parents | 648fbf434415 |
children | de505aec360d |
files | lisp/ediff-init.el |
diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ediff-init.el Wed Jan 10 08:57:41 2007 +0000 +++ b/lisp/ediff-init.el Wed Jan 10 15:24:06 2007 +0000 @@ -1410,9 +1410,10 @@ (defcustom ediff-autostore-merges 'group-jobs-only "*Save the results of merge jobs automatically. -nil means don't save automatically. t means always save. Anything else -means save automatically only if the merge job is part of a group of jobs, such -as `ediff-merge-directory' or `ediff-merge-directory-revisions'." +With value nil, don't save automatically. With value t, always +save. Anything else means save automatically only if the merge +job is part of a group of jobs, such as `ediff-merge-directory' +or `ediff-merge-directory-revisions'." :type '(choice (const nil) (const t) (const group-jobs-only)) :group 'ediff-merge) (make-variable-buffer-local 'ediff-autostore-merges)