|
|
HP-UX Reference > Mmerge(1)HP-UX 11i Version 2: December 2007 Update |
|
NAMEmerge — three-way file merge DESCRIPTIONmerge combines two files that are revisions of a single original file. The original file is file2, and the revised files are file1 and file3. merge identifies all changes that lead from file2 to file3 and from file2 to file1, then deposits the merged text into file1. If the -p option is used, the result goes to standard output instead of file1. An overlap occurs if both file1 and file3 have changes in the same place. 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, edit the result in file1 and delete one of the alternatives. This command is particularly useful for revision control, especially if file1 and file3 are the ends of two branches that have file2 as a common ancestor. EXAMPLESA typical use for merge is as follows:
|
|