From f165f20f9e48ef04ac24357977823712bda4e03e Mon Sep 17 00:00:00 2001 From: delphij Date: Fri, 15 Jun 2007 07:49:35 +0000 Subject: Apply vendor patch that implements 1/2 as aliases of l/r. Requested by: dmalone, Chuck Swiger --- contrib/diff/doc/diff.texi | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'contrib/diff/doc') 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 -- cgit v1.1