diff options
| author | Eli Zaretskii | 2001-05-18 10:52:51 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2001-05-18 10:52:51 +0000 |
| commit | a010164db4d992a27d18b06419fac743eefadf10 (patch) | |
| tree | cbb96adb9601fee0ae6ca48d87e69fd8aca68080 | |
| parent | 11c9c5af13a042f75e89d26b63a9a4b134db4529 (diff) | |
| download | emacs-a010164db4d992a27d18b06419fac743eefadf10.tar.gz emacs-a010164db4d992a27d18b06419fac743eefadf10.zip | |
(Merging and diff3): Avoid Overfull hbox.
| -rw-r--r-- | man/ediff.texi | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/man/ediff.texi b/man/ediff.texi index e2ca5c19144..3e6a73ca710 100644 --- a/man/ediff.texi +++ b/man/ediff.texi | |||
| @@ -1880,15 +1880,18 @@ buffer) are displayed in the merged region of buffer C. The strings in the | |||
| 1880 | template determine the text that separates the aforesaid regions. The | 1880 | template determine the text that separates the aforesaid regions. The |
| 1881 | default template is | 1881 | default template is |
| 1882 | 1882 | ||
| 1883 | @example | 1883 | @smallexample |
| 1884 | ("@value{seven-left} variant A" A "@value{seven-right} variant B" B "####### Ancestor" Ancestor "======= end") | 1884 | ("@value{seven-left} variant A" A "@value{seven-right} variant B" B |
| 1885 | @end example | 1885 | "####### Ancestor" Ancestor "======= end") |
| 1886 | @end smallexample | ||
| 1886 | 1887 | ||
| 1887 | and the corresponding combined region is shown above. The order in which | 1888 | @noindent |
| 1888 | the regions are shown (and the separator strings) can be changed by | 1889 | (this is one long line) and the corresponding combined region is shown |
| 1889 | changing the above template. It is even possible to add or delete region | 1890 | above. The order in which the regions are shown (and the separator |
| 1890 | specifiers in this template (although the only possibly useful such | 1891 | strings) can be changed by changing the above template. It is even |
| 1891 | modification seems to be the deletion of the ancestor). | 1892 | possible to add or delete region specifiers in this template (although |
| 1893 | the only possibly useful such modification seems to be the deletion of | ||
| 1894 | the ancestor). | ||
| 1892 | 1895 | ||
| 1893 | In addition to the state of the difference, Ediff displays the state of the | 1896 | In addition to the state of the difference, Ediff displays the state of the |
| 1894 | merge for each region. If a difference came from buffer A by default | 1897 | merge for each region. If a difference came from buffer A by default |