×
UNIX.COM Login
Username:
Password:  
Show Password






👤


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

Linux & Unix Commands - Search Man Pages
Man Page or Keyword Search:
man
Select Man Page Set:


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 std. output if -p is present, into file1 otherwise. Merge is useful for combining sepa-
       rate  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 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.

IDENTIFICATION
       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.

SEE ALSO
       diff3 (1), diff (1), rcsmerge (1), co (1).

Purdue University			     6/29/83					 MERGE(1)


All times are GMT -4. The time now is 03:30 PM.

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