Return to merge.1 CVS log

Up to [CSRG BSD Unix] / 43BSD / contrib / rcs / man

Annotation of 43BSD/contrib/rcs/man/merge.1, revision 1.1.1.1

1.1       root        1: .TH MERGE 1 6/29/83 "Purdue University"
                      2: .SH NAME
                      3: merge \- three-way file merge
                      4: .SH SYNOPSIS
                      5: \fBmerge\fR [ \fB-p\fR ] file1 file2 file3
                      6: .SH DESCRIPTION
                      7: .I Merge
                      8: incorporates all changes that lead from \fIfile2\fR to \fIfile3\fR into 
                      9: \fIfile1\fR. The result goes to std. output if \fB-p\fR is present, into 
                     10: \fIfile1\fR otherwise. \fIMerge\fR is useful for combining separate changes 
                     11: to an original. Suppose \fIfile2\fR is the original, and both \fIfile1\fR 
                     12: and \fIfile3\fR are modifications of \fIfile2\fR. Then \fImerge\fR 
                     13: combines both changes. 
                     14: .PP
                     15: An overlap occurs if both \fIfile1\fR and \fIfile3\fR
                     16: have changes in a common segment of lines.
                     17: \fIMerge\fR prints how many overlaps occurred, and includes both alternatives
                     18: in the result. The alternatives are delimited as follows:
                     19: .sp
                     20: .nf
                     21:         <<<<<<< file1
                     22:         lines in file1
                     23:         =======
                     24:         lines in file3
                     25:         >>>>>>> file3
                     26: .fi
                     27: .sp
                     28: If there are overlaps, the user should edit the result and delete one of the
                     29: alternatives.
                     30: .SH IDENTIFICATION
                     31: .de VL
                     32: \\$2
                     33: ..
                     34: Author: Walter F. Tichy,
                     35: Purdue University, West Lafayette, IN, 47907.
                     36: .sp 0
                     37: Revision Number:
                     38: .VL $Revision: 3.0 $
                     39: ; Release Date:
                     40: .VL $Date: 82/11/25 11:43:41 $
                     41: \&.
                     42: .sp 0
                     43: Copyright \(co 1982 by Walter F. Tichy.
                     44: .SH SEE ALSO
                     45: diff3 (1), diff (1), rcsmerge (1), co (1).

This archive runs on limited infrastructure. Preserving old code on modern bandwidth. Automated agents are requested to crawl responsibly.