RE: cvs update; merge

[Paul Sander]

>--- Forwarded mail from address@hidden

>Now, all that's needed is to have CVS invoke the above wrapper, replacing
>the hard-coded invocation of diff3.

For demonstration purposes, the wrapper could even be called "diff3"
and accept the -E option as a no-op, and be placed in a directory that's
early in the user's path.

>--- End of forwarded message from address@hidden