Home
Main website
Display Sidebar
Hide Ads
Recent Changes
View Source:
merge(1)
Edit
PageHistory
Diff
Info
LikePages
MERGE !!!MERGE NAME SYNOPSIS DESCRIPTION OPTIONS DIAGNOSTICS IDENTIFICATION SEE ALSO BUGS ---- !!NAME merge - three-way file merge !!SYNOPSIS __merge__ [[ ''options'' ] ''file1 file2 file3'' !!DESCRIPTION __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 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 __-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 information 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 's version number. !!DIAGNOSTICS Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble. !!IDENTIFICATION Author: 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 ALSO diff3(1), diff(1), rcsmerge(1), co(1). !!BUGS It normally does not make sense to merge binary files as if they were text, but __merge__ tries to do it anyway. ----
4 pages link to
merge(1)
:
h2xs(1)
rcsmerge(1)
Man1m
co(1)
This page is a man page (or other imported legacy content). We are unable to automatically determine the license status of this page.
