procyberian/emacs
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

(ediff-combination-pattern): Fix typo in docstring.

Browse source 
(ediff-show-clashes-only): Doc fix.
This commit is contained in:
Juanma Barranquero 2006-12-11 01:28:02 +00:00
parent 542b315f36
commit 4601d7c454
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ediff-merg.el
View file

@ -62,7 +62,7 @@ Valid values are the symbols `default-A', `default-B', and `combined'."
'("<<<<<<< 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 @@ 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. A value of nil means show all regions."
:type 'boolean
:group 'ediff-merge
)