Linux and UNIX Man Pages

Linux & Unix Commands - Search Man Pages

BSD 2.11 - man page for merge (bsd section 1)

MERGE(1)						      General Commands Manual							  MERGE(1)

merge - three-way file merge
merge [ -p ] file1 file2 file3
Merge incorporates all changes that lead from file2 to file3 into file1. The result goes to std. output if -p is present, into file1 other- wise. Merge is useful for combining separate changes to an original. Suppose file2 is the original, and both file1 and file3 are modifica- tions 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 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.
Author: Walter F. Tichy, Purdue University, West Lafayette, IN, 47907. Revision Number: 3.0 ; Release Date: 82/11/25 . Copyright (C) 1982 by Walter F. Tichy.
diff3 (1), diff (1), rcsmerge (1), co (1). Purdue University 6/29/83 MERGE(1)
All times are GMT -4. The time now is 12:35 AM.

Unix & Linux Forums Content Copyright 1993-2018. All Rights Reserved.
Show Password

Not a Forum Member?
Forgot Password?