From f0529b5b1aeb64a7df9765781948a5edbfc80b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jan=C3=ADk?= Date: Thu, 20 Dec 2001 19:01:00 +0000 Subject: Doc fix. --- lisp/ediff-merg.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/ediff-merg.el') diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 5242014eb7e..88034dbbd56 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -82,7 +82,7 @@ STRING4 (defcustom ediff-show-clashes-only nil "*If t, show only those diff regions where both buffers disagree with the ancestor. This means that regions that have status prefer-A or prefer-B will be -skipped over. Nil means show all regions." +skipped over. nil means show all regions." :type 'boolean :group 'ediff-merge ) -- cgit v1.2.1