merge(1) merge(1)NAME merge - three-way file merge SYNOPSIS merge [-p] file1 file2 file3 DESCRIPTION merge incorporates all changes that lead from file2 to file3 into file1. The result goes to the standard output if -p is present, and into file1 otherwise. merge is useful for com- bining separate changes to an original. Suppose file2 is the original, and both file1 and file3 are modifications of file2. Then merge combines both changes. An overlap occurs if both file1 and file3 have changes in a common segment of lines. merge prints information on how many overlaps occurred and includes both alternatives in the result. The alternatives are delimited as follows: <<<<<<< file1 lines in file1 ======= lines in file3 >>>>>>> file3 If there are overlaps, the user should edit the result and delete one of the alternatives. DISCLAIMER This reference manual entry describes a utility that Apple understands to have been released into the public domain by its author or authors. Apple has included this public domain utility for your convenience. Use it at your own discretion. Often the source code can be obtained if addi- tional requirements are met, such as the purchase of a site license from an author or institution. IDENTIFICATION Author: Walter F. Tichy, Purdue University, West Lafayette, IN 47907.cCopyright 1982 by Walter F. Tichy.SEE ALSO co(1), diff(1), diff3(1), rcsmerge(1). April, 1990 1