src/usr.bin/cvs/cvs.1 - diff

Return to cvs.1 CVS log

Up to [local] / src / usr.bin / cvs

Diff for /src/usr.bin/cvs/cvs.1 between version 1.122 and 1.123

version 1.122, 2009/03/25 09:47:26

version 1.123, 2009/04/28 09:05:39

Line 517

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

Line 526

.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

Line 583

Line 596

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: