summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>1998-04-14 10:56:46 +0000
committerAndreas Schwab <schwab@suse.de>1998-04-14 10:56:46 +0000
commit0f94f94657ad7a6a68e64c612285a5e06152def2 (patch)
treee0e7425f2fcebd4baf1ee024c876f9b784136761
parent848407099a0b749ff9e7b8a2c74255736d7ac100 (diff)
downloademacs-0f94f94657ad7a6a68e64c612285a5e06152def2.tar.gz
(ediff-autostore-merges): Doc fix.
-rw-r--r--lisp/ediff-init.el2
1 files changed, 1 insertions, 1 deletions
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)