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