IPnom Home • Manuals • FreeBSD

 FreeBSD Man Pages

Man Sections:Commands (1)System Calls (2)Library Functions (3)Device Drivers (4)File Formats (5)Miscellaneous (7)System Utilities (8)
Keyword Live Search (10 results max):
 Type in part of a command in the search box.



       merge - three-way file merge


       merge [ options ] file1 file2 file3


       merge  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 origi-
       nal, 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 seg-
       ment of lines.  If a conflict is found, merge normally outputs a  warn-
       ing  and brackets the conflict with <<<<<<< and >>>>>>> lines.  A typi-
       cal 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.


       -A     Output conflicts using the -A style of diff3(1), if supported by
	      diff3.  This merges all changes leading from file2 to file3 into
	      file1, and generates the most verbose output.

       -E, -e These  options specify conflict styles that generate less infor-
	      mation than -A.  See diff3(1) for details.  The default  is  -E.
	      With -e, merge does not warn about conflicts.

       -L label
	      This option may be given up to three times, and specifies labels
	      to be used in place of the corresponding file names in  conflict
	      reports.	 That  is, merge -L x -L y -L z a b c generates output
	      that looks like it came from files x, y and z  instead  of  from
	      files a, b and c.

       -p     Send results to standard output instead of overwriting file1.

       -q     Quiet; do not warn about conflicts.

       -V     Print RCS's version number.


       Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble.


       Author: Walter F. Tichy.
       Manual Page Revision: 1.6; Release Date: 1999/08/27.
       text, but merge tries to do it anyway.

GNU				  1999/08/27			      MERGE(1)


Man(1) output converted with man2html , sed , awk