Apply vendor patch that implements 1/2 as aliases of l/r.

Requested by:   dmalone, Chuck Swiger

This commit is contained in:

Xin LI

2007-06-15 07:49:35 +00:00

parent 4366265d16

commit b61bbb7026

2 changed files with 16 additions and 11 deletions

View File

@@ -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