[unix-history] / usr / src / usr.bin / diff / diff3 / diff3.1

.\"	@(#)diff3.1	6.1 (Berkeley) %G%
.\"
.TH DIFF3 1 ""
.AT 3
.SH NAME
diff3 \- 3-way differential file comparison
.SH SYNOPSIS
.B diff3
[
.B \-ex3
]
file1 file2 file3
.SH DESCRIPTION
.I Diff3
compares three versions of a file,
and publishes disagreeing ranges of text
flagged with these codes:
.TP 16
====
all three files differ
.TP 16
====1
.IR file1 " is different"
.TP 16
====2
.IR file2 " is different"
.TP 16
====3
.IR file3 " is different"
.PP
The type of change suffered in converting a given range
of a given file to some other is
indicated in one of these ways:
.TP 16
.IB f " : " n1 " a"
Text is to be appended after line number
.I n1
in file
.I f,
where
.I f
= 1, 2, or 3.
.TP 16
.IB f " : " n1 " , " n2 " c"
Text is to be
changed in the range line
.I n1
to line
.IR n2 .
If 
.I n1
=
.I n2,
the range may be abbreviated to
.IR n1 .
.PP
The original contents of the range follows immediately
after a
.B c
indication.
When the contents of two
files are identical, the contents of the lower-numbered
file is suppressed.
.PP
Under the
.B \-e
option,
.I diff3
publishes a script for the editor
.I ed
that will incorporate into
.I file1
all changes between
.I file2
and
.I file3,
.IR i.e .
the changes that normally would be flagged ==== and ====3.
Option
.B \-x
(\fB\-3\fR)
produces a script to incorporate
only changes flagged ==== (====3).
The following command will apply the resulting script to
`file1'.
.PP
.ti 16n
(cat script; echo \'1,$p\') \(bv ed \- file1
.SH FILES
/tmp/d3?????
.br
/usr/lib/diff3
.SH "SEE ALSO"
diff(1)
.SH BUGS
Text lines that consist of a single `.' will
defeat
.B \-e.
Commit	Line	Data
fad0acda	1	.\" @(#)diff3.1 6.1 (Berkeley) %G%
eadf9268	2	.\"
fad0acda	3	.TH DIFF3 1 ""
eadf9268 KM	4	.AT 3
	5	.SH NAME
	6	diff3 \- 3-way differential file comparison
	7	.SH SYNOPSIS
	8	.B diff3
	9	[
	10	.B \-ex3
	11	]
	12	file1 file2 file3
	13	.SH DESCRIPTION
	14	.I Diff3
	15	compares three versions of a file,
	16	and publishes disagreeing ranges of text
	17	flagged with these codes:
	18	.TP 16
	19	====
	20	all three files differ
	21	.TP 16
	22	====1
	23	.IR file1 " is different"
	24	.TP 16
	25	====2
	26	.IR file2 " is different"
	27	.TP 16
	28	====3
	29	.IR file3 " is different"
	30	.PP
	31	The type of change suffered in converting a given range
	32	of a given file to some other is
	33	indicated in one of these ways:
	34	.TP 16
	35	.IB f " : " n1 " a"
	36	Text is to be appended after line number
	37	.I n1
	38	in file
	39	.I f,
	40	where
	41	.I f
	42	= 1, 2, or 3.
	43	.TP 16
	44	.IB f " : " n1 " , " n2 " c"
	45	Text is to be
	46	changed in the range line
	47	.I n1
	48	to line
	49	.IR n2 .
	50	If
	51	.I n1
	52	=
	53	.I n2,
	54	the range may be abbreviated to
	55	.IR n1 .
	56	.PP
	57	The original contents of the range follows immediately
	58	after a
	59	.B c
	60	indication.
	61	When the contents of two
	62	files are identical, the contents of the lower-numbered
	63	file is suppressed.
	64	.PP
	65	Under the
	66	.B \-e
	67	option,
68	.I diff3
69	publishes a script for the editor
70	.I ed
71	that will incorporate into
72	.I file1
73	all changes between
74	.I file2
75	and
76	.I file3,
77	.IR i.e .
78	the changes that normally would be flagged ==== and ====3.
79	Option
80	.B \-x
81	(\fB\-3\fR)
82	produces a script to incorporate
83	only changes flagged ==== (====3).
84	The following command will apply the resulting script to
85	`file1'.
86	.PP
87	.ti 16n
88	(cat script; echo \'1,$p\') \(bv ed \- file1
89	.SH FILES
90	/tmp/d3?????
91	.br
92	/usr/lib/diff3
93	.SH "SEE ALSO"
94	diff(1)
95	.SH BUGS
96	Text lines that consist of a single `.' will
97	defeat
98	.B \-e.