procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(ediff-autostore-merges): Doc fix.

Browse source
This commit is contained in:
Juanma Barranquero 2007-01-10 15:24:06 +00:00
parent 5ce4f044d9
commit d483ec4cdb
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ediff-init.el
View file

@ -1410,9 +1410,10 @@ This property can be toggled interactively."
(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)