diff options
| author | Juanma Barranquero | 2006-12-11 01:28:02 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2006-12-11 01:28:02 +0000 |
| commit | 4601d7c4544636174f18e028b64f7b1e5a531275 (patch) | |
| tree | c23a308a0a2f41d803823d55a986c0087e17b359 | |
| parent | 542b315f361328fcbfed025e55d1596d570958cc (diff) | |
| download | emacs-4601d7c4544636174f18e028b64f7b1e5a531275.tar.gz emacs-4601d7c4544636174f18e028b64f7b1e5a531275.zip | |
(ediff-combination-pattern): Fix typo in docstring.
(ediff-show-clashes-only): Doc fix.
| -rw-r--r-- | lisp/ediff-merg.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 92f462c0181..2dba9e4116b 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el | |||
| @@ -62,7 +62,7 @@ Valid values are the symbols `default-A', `default-B', and `combined'." | |||
| 62 | '("<<<<<<< variant A" A ">>>>>>> variant B" B "####### Ancestor" Ancestor "======= end") | 62 | '("<<<<<<< variant A" A ">>>>>>> variant B" B "####### Ancestor" Ancestor "======= end") |
| 63 | "*Pattern to be used for combining difference regions in buffers A and B. | 63 | "*Pattern to be used for combining difference regions in buffers A and B. |
| 64 | The value must be a list of the form | 64 | The value must be a list of the form |
| 65 | (STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4) | 65 | \(STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4) |
| 66 | where bufspec is the symbol A, B, or Ancestor. For instance, if the value is | 66 | where bufspec is the symbol A, B, or Ancestor. For instance, if the value is |
| 67 | '(STRING1 A STRING2 Ancestor STRING3 B STRING4) then the | 67 | '(STRING1 A STRING2 Ancestor STRING3 B STRING4) then the |
| 68 | combined text will look like this: | 68 | combined text will look like this: |
| @@ -82,7 +82,7 @@ STRING4 | |||
| 82 | (defcustom ediff-show-clashes-only nil | 82 | (defcustom ediff-show-clashes-only nil |
| 83 | "*If t, show only those diff regions where both buffers disagree with the ancestor. | 83 | "*If t, show only those diff regions where both buffers disagree with the ancestor. |
| 84 | This means that regions that have status prefer-A or prefer-B will be | 84 | This means that regions that have status prefer-A or prefer-B will be |
| 85 | skipped over. nil means show all regions." | 85 | skipped over. A value of nil means show all regions." |
| 86 | :type 'boolean | 86 | :type 'boolean |
| 87 | :group 'ediff-merge | 87 | :group 'ediff-merge |
| 88 | ) | 88 | ) |