From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 10 Jan 2007 15:24:06 +0000 (+0000)
Subject: (ediff-autostore-merges): Doc fix.
X-Git-Tag: emacs-pretest-22.0.93~177
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d483ec4cdb6915485b535118d67b1ce0413501d2;p=emacs.git

(ediff-autostore-merges): Doc fix.
---

diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 2fc0ceefe4d..75b2fdc6fc5 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -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)