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

Return to diff.1 CVS log

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

Diff for /src/usr.bin/diff/diff.1 between version 1.18 and 1.19

version 1.18, 2003/07/22 01:23:51

version 1.19, 2003/07/27 07:39:52

Line 37

.Nd differential file and directory comparator

.Sh SYNOPSIS

.Nm diff

.Op Fl abilqtTw

.Op Fl abdilqtTw

.Oo

.Fl c | Fl e | Fl f |

.Fl n | Fl u

Line 45

.Op Fl L Ar label

.Ar file1 file2

.Nm diff

.Op Fl abilqtTw

.Op Fl abdilqtTw

.Op Fl L Ar label

.Fl C Ar number

.Ar file1 file2

.Nm diff

.Op Fl abilqtw

.Op Fl abdilqtw

.Fl D Ar string

.Ar file1 file2

.Nm diff

.Op Fl abilqtTw

.Op Fl abdilqtTw

.Op Fl L Ar label

.Fl U Ar number

.Ar file1 file2

.Nm diff

.Op Fl abilNqtTw

.Op Fl abdilNqtTw

.Oo

.Fl c | Fl e | Fl f |

.Fl n | Fl u

Line 105

Lines which are changed from one file to the other are marked in

both files with

.Sq !\ \& .

Changes which lie within 3 lines of each other are grouped together on output.

Changes which lie within 3 lines of each other are grouped together on

output.

.It Fl d

Try very hard to produce a diff as small as possible. This may consume a

lot of processing power and memory when processing large files with

many changes.

.It Fl e

Produces output in a form suitable as input for the editor utility,

.Xr ed 1 ,