file1 file2 file3
Performs a three-way file merge. merge incorporates all changes that lead from
file3 and puts the results into
file1. merge is useful for combining separate changes to an original. Suppose
file2 is the original, and both
file3 are modifications of
file2. Then merge combines both changes. A conflict occurs if both
file3 have changes in a common segment of lines. If a conflict is found, merge normally outputs a warning and puts brackets around the conflict, with lines preceded by
>>>>>>>. A typical conflict looks like this:
<<<<<<< file1 relevant lines from file1 = = = = = = = relevant lines from file3 >>>>>>> file3
If there are conflicts, the user should edit the result and delete one of the alternatives.
Output conflicts using the -A style of diff3. This merges all changes leading from
file1, and generates the most verbose output.
Don't warn about conflicts.
Output conflict information in a less verbose style than -A; this is the default.
Specify up to three labels to be used in place of the corresponding filenames in conflict reports. That is:
z file_a file_b file_c
generates output that looks as if it came from
z instead of from
Send results to standard output instead of overwriting
Quiet; don't warn about conflicts.
Print version number.