=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/cvs.1,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- src/usr.bin/cvs/cvs.1 2009/03/25 09:47:26 1.122 +++ src/usr.bin/cvs/cvs.1 2009/04/28 09:05:39 1.123 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cvs.1,v 1.122 2009/03/25 09:47:26 joris Exp $ +.\" $OpenBSD: cvs.1,v 1.123 2009/04/28 09:05:39 sthen Exp $ .\" .\" Copyright (c) 2004 Jean-Francois Brousseau .\" Copyright (c) 2004-2008 Xavier Santolaria @@ -24,7 +24,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: March 25 2009 $ +.Dd $Mdocdate: April 28 2009 $ .Dt CVS 1 .Os .Sh NAME @@ -517,7 +517,7 @@ program, except that the differential comparisons that it generates are between local or remote revisions of files stored in the CVS repository. .Bd -literal -offset indent -usage: cvs diff [-cilNnpRu] +usage: cvs diff [-abcdilNnpRuw] [[-D date1 | -r rev1] [-D date2 | -r rev2]] [-k mode] [file ...] .Ed @@ -526,11 +526,24 @@ .Ic diff command takes the following options: .Bl -tag -width Ds -offset 3n +.It Fl a +Treat all files as ASCII text. +See +.Xr diff 1 +for more information. +.It Fl b +Causes trailing blanks (spaces and tabs) to be ignored, and other +strings of blanks to compare equal. .It Fl c Produces a diff with three lines of context. See .Xr diff 1 for more information. +.It Fl d +Try very hard to produce a diff as small as possible. +See +.Xr diff 1 +for more information. .It Xo Fl D Ar date1 .Op Fl D Ar date2 .Xc @@ -583,6 +596,14 @@ See .Xr diff 1 for more information. +.It Fl w +Is similar to +.Fl b +but causes whitespace (blanks and tabs) to be totally ignored. +E.g., +.Dq if (\ \&a == b \&) +will compare equal to +.Dq if(a==b) . .El .Pp Aliases: