|
NAMEmerge - three-way file mergeSYNOPSISmerge [ options ] file1 file2 file3DESCRIPTIONmerge incorporates all changes that lead from file2 to file3 into file1. The result ordinarily goes into file1. merge is useful for combining separate changes to an original. Suppose file2 is the original, and both file1 and file3 are modifications of file2. Then merge combines both changes.A conflict occurs if both file1 and file3 have changes in a common segment of lines. If a conflict is found, merge normally outputs a warning and brackets the conflict with <<<<<<< and >>>>>>> lines. A typical conflict will look like this: <<<<<<< file A lines in file A ======= lines in file B >>>>>>> file B If there are conflicts, the user should edit the result and delete one of the alternatives. OPTIONS
DIAGNOSTICSExit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble.IDENTIFICATIONAuthor: Walter F. Tichy.Manual Page Revision: 5.7; Release Date: 1995/06/01. Copyright © 1982, 1988, 1989 Walter F. Tichy. Copyright © 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert. SEE ALSOdiff3(1), diff(1), rcsmerge(1), co(1).BUGSIt normally does not make sense to merge binary files as if they were text, but merge tries to do it anyway.
Visit the GSP FreeBSD Man Page Interface. |