# HG changeset patch # User Andreas Schwab # Date 892551406 0 # Node ID 984881b316fc875fd95d23763717a94ea632d036 # Parent cd1971673dfd2e756be1eee264287c4a76ad9284 (ediff-autostore-merges): Doc fix. diff -r cd1971673dfd -r 984881b316fc lisp/ediff-init.el --- a/lisp/ediff-init.el Tue Apr 14 10:48:10 1998 +0000 +++ b/lisp/ediff-init.el Tue Apr 14 10:56:46 1998 +0000 @@ -1548,7 +1548,7 @@ "*Save the results of merge jobs automatically. Nil means don't save automatically. t means always save. Anything but nil or t 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'." +as `ediff-merge-directories' 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)