diff options
Diffstat (limited to 'lisp/ediff-merg.el')
| -rw-r--r-- | lisp/ediff-merg.el | 2 |
1 files changed, 1 insertions, 1 deletions
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 ) |