From: Andreas Schwab Date: Tue, 14 Apr 1998 10:56:46 +0000 (+0000) Subject: (ediff-autostore-merges): Doc fix. X-Git-Tag: emacs-20.3~1562 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f94f94657ad7a6a68e64c612285a5e06152def2;p=emacs.git (ediff-autostore-merges): Doc fix. --- diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index db06f27771b..8f832bf6457 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -1548,7 +1548,7 @@ This property can be toggled interactively." "*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)