46 lines
1.3 KiB
Groff
46 lines
1.3 KiB
Groff
.TH MERGE 1L "" "Purdue University"
|
|
.SH NAME
|
|
merge \- three-way file merge
|
|
.SH SYNOPSIS
|
|
\fBmerge\fR [ \fB-p\fR ] file1 file2 file3
|
|
.SH DESCRIPTION
|
|
.I Merge
|
|
incorporates all changes that lead form \fIfile2\fR to \fIfile3\fR into
|
|
\fIfile1\fR. The result goes to std. output if \fB-p\fR is present, into
|
|
\fIfile1\fR otherwise. \fIMerge\fR is useful for combining separate changes
|
|
to an original. Suppose \fIfile2\fR is the original, and both \fIfile1\fR
|
|
and \fIfile3\fR are modifications of \fIfile2\fR. Then \fImerge\fR
|
|
combines both changes.
|
|
.PP
|
|
An overlap occurs if both \fIfile1\fR and \fIfile3\fR
|
|
have changes in a common segment of lines.
|
|
\fIMerge\fR prints how many overlaps occurred, and includes both alternatives
|
|
in the result. The alternatives are delimited as follows:
|
|
.sp
|
|
.nf
|
|
<<<<<<< file1
|
|
lines in file1
|
|
=======
|
|
lines in file3
|
|
>>>>>>> file3
|
|
.fi
|
|
.sp
|
|
If there are overlaps, the user should edit the result and delete one of the
|
|
alternatives.
|
|
.SH IDENTIFICATION
|
|
.de VL
|
|
\\$2
|
|
..
|
|
Author: Walter F. Tichy,
|
|
Purdue University, West Lafayette, IN, 47907.
|
|
.sp 0
|
|
Revision Number:
|
|
.VL $Revision: 1.1.1.1 $
|
|
; Release Date:
|
|
.VL $Date: 1993/03/21 09:45:37 $
|
|
\&.
|
|
.sp 0
|
|
Copyright \(co 1982, 1988, 1989 by Walter F. Tichy.
|
|
.SH SEE ALSO
|
|
diff3 (1), diff (1), rcsmerge (1L), co (1L).
|