diff options
Diffstat (limited to 'doc/misc/ediff.texi')
| -rw-r--r-- | doc/misc/ediff.texi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 451d6d0a5f..4259fccb39 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -1986,7 +1986,8 @@ If it is @code{combined} then the region in buffer C will look like this: @comment Use @set to avoid triggering merge conflict detectors like CVS. -@set seven-left +@set seven-left <<<<<<< +@set seven-right >>>>>>> @example @value{seven-left} variant A the difference region from buffer A |