Mercurial > emacs
comparison man/ediff.texi @ 37797:d0c11ec0421d
(Merging and diff3): Avoid Overfull hbox.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 18 May 2001 10:52:51 +0000 |
| parents | 730f77edf073 |
| children | 10482dd382e7 |
comparison
equal
deleted
inserted
replaced
| 37796:22142f7e2f6e | 37797:d0c11ec0421d |
|---|---|
| 1878 the corresponding difference regions (from buffers A, B, and the ancestor | 1878 the corresponding difference regions (from buffers A, B, and the ancestor |
| 1879 buffer) are displayed in the merged region of buffer C. The strings in the | 1879 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 | 1886 @end smallexample |
| 1887 and the corresponding combined region is shown above. The order in which | 1887 |
| 1888 the regions are shown (and the separator strings) can be changed by | 1888 @noindent |
| 1889 changing the above template. It is even possible to add or delete region | 1889 (this is one long line) and the corresponding combined region is shown |
| 1890 specifiers in this template (although the only possibly useful such | 1890 above. The order in which the regions are shown (and the separator |
| 1891 modification seems to be the deletion of the ancestor). | 1891 strings) can be changed by changing the above template. It is even |
| 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 |
| 1895 (because both regions A and B were different from the ancestor and | 1898 (because both regions A and B were different from the ancestor and |
| 1896 @code{ediff-default-variant} was set to @code{default-A}) then | 1899 @code{ediff-default-variant} was set to @code{default-A}) then |