1MERGE(1)                    General Commands Manual                   MERGE(1)
2
3
4

NAME

6       merge - three-way file merge
7

SYNOPSIS

9       merge [ -p ] file1 file2 file3
10

DESCRIPTION

12       Merge  incorporates  all  changes  that  lead  from file2 to file3 into
13       file1. The result goes to std. output if -p is present, into file1 oth‐
14       erwise.  Merge is useful for combining separate changes to an original.
15       Suppose file2 is the original, and both file1 and file3  are  modifica‐
16       tions of file2. Then merge combines both changes.
17
18       An overlap occurs if both file1 and file3 have changes in a common seg‐
19       ment of lines.  Merge prints how many overlaps occurred,  and  includes
20       both alternatives in the result. The alternatives are delimited as fol‐
21       lows:
22
23               <<<<<<< file1
24               lines in file1
25               =======
26               lines in file3
27               >>>>>>> file3
28
29       If there are overlaps, the user should edit the result and  delete  one
30       of the alternatives.
31

IDENTIFICATION

33       Author: Walter F. Tichy, Purdue University, West Lafayette, IN, 47907.
34       Revision Number: 3.0 ; Release Date: 82/11/25 .
35       Copyright © 1982 by Walter F. Tichy.
36

SEE ALSO

38       diff3 (1), diff (1), rcsmerge (1), co (1).
39
40
41
42Purdue University                   6/29/83                           MERGE(1)