Mercurial > emacs
changeset 74585:402a04b0362f
(ediff-combination-pattern): Fix typo in docstring.
(ediff-show-clashes-only): Doc fix.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Mon, 11 Dec 2006 01:28:02 +0000 |
| parents | 3043e9ec901c |
| children | 30655edb57ac |
| files | lisp/ediff-merg.el |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ediff-merg.el Sun Dec 10 23:58:23 2006 +0000 +++ b/lisp/ediff-merg.el Mon Dec 11 01:28:02 2006 +0000 @@ -62,7 +62,7 @@ '("<<<<<<< variant A" A ">>>>>>> variant B" B "####### Ancestor" Ancestor "======= end") "*Pattern to be used for combining difference regions in buffers A and B. The value must be a list of the form -(STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4) +\(STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4) where bufspec is the symbol A, B, or Ancestor. For instance, if the value is '(STRING1 A STRING2 Ancestor STRING3 B STRING4) then the combined text will look like this: @@ -82,7 +82,7 @@ (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. A value of nil means show all regions." :type 'boolean :group 'ediff-merge )