Joel> Personally, I'd even get rid of the "diff -cp" alternative. We'll
Joel> continue accepting context diffs, but I think that suggesting it,
Joel> even if we say later on that we prefer unified diffs, will result
Joel> in more patches sent in that format.

Pedro> Completely agreed.  /me pokes at Stan.  :-)

Joel> If we do not want to remove
Joel> the context diff alternative, then at least let's put it second.

I have modified to put the context diff alternative second.  I did not
remove it altogether as I have not seen more support to removing it.

2012-04-17  Siva Chandra Reddy  <sivachandra@google.com>

        * CONTRIBUTE: Add "cvs diff -up" as a way to generate patches
        when accessing the CVS repository.  Add a note saying that the
        "-up" flavors of "cvs diff" and "diff" are preferred.

Thanks,
Siva Chandra