diff options
| author | delphij <delphij@FreeBSD.org> | 2007-06-15 07:49:35 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2007-06-15 07:49:35 +0000 |
| commit | d4335e2e0b750eb3e39554d703b90e85eb89441e (patch) | |
| tree | 505be3cb9b6d832f9a502003d8822e5b0dee25d5 /contrib/diff/doc/diff.texi | |
| parent | 3a21074c9c4f3166f2c87a882b79ad21227be9af (diff) | |
| parent | f165f20f9e48ef04ac24357977823712bda4e03e (diff) | |
| download | FreeBSD-src-d4335e2e0b750eb3e39554d703b90e85eb89441e.zip FreeBSD-src-d4335e2e0b750eb3e39554d703b90e85eb89441e.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r170764,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/diff/doc/diff.texi')
| -rw-r--r-- | contrib/diff/doc/diff.texi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/diff/doc/diff.texi b/contrib/diff/doc/diff.texi index a8724f4..607e862 100644 --- a/contrib/diff/doc/diff.texi +++ b/contrib/diff/doc/diff.texi @@ -2465,18 +2465,22 @@ Like @samp{eb}, except precede each version with a header that shows what file and lines the version came from. @item el +@itemx e1 Edit a copy of the left version, then copy the result to the output. @item er +@itemx e2 Edit a copy of the right version, then copy the result to the output. @item l +@itemx 1 Copy the left version to the output. @item q Quit. @item r +@itemx 2 Copy the right version to the output. @item s |
