MPE/iX Shell and Utilities Reference Manual, Vol 1

merge(1) MPE/iX Shell and Utilities merge(1)
NAME
merge — three-way file merge
SYNOPSIS
merge [–H][–h][–p][–q][–Z] file1 root file2 [mark1 [mark2]]
DESCRIPTION
merge incorporates all changes that lead from root to file2 into file1. The result is stored in
file1.
merge is useful for combining separate changes to an original. Suppose root is the original,
and both file1 and file2 are modifications of root. Then, merge combines both changes.
An overlap occurs if both file1 and file2 have changes in a common segment of lines. merge
prints how many overlaps occurred, and includes both alternatives in the result. The alterna-
tives are delimited as follows:
<<<<<<< file1
lines in file1
=======
lines in file2
>>>>>>> file2
If there are overlaps, you should edit the result and delete one of the alternatives.
Putting in a word or phrase for mark1 and/or mark2 lets you change what is printed to mark
overlapping lines in file1 and/or file2. You must use double quotes if you substitute in a phrase
rather than a single word.
RCS users normally use rcsmerge(1) to access this functionality rather than calling merge
directly.
Options
merge accepts the following options:
–H tells diff to use the –H option when called by merge.
–h tells diff to use the –h option when called by merge.
–p sends the final result of the merge operation to the standard output. Normally,
merge stores the result in file1.
–q quiet mode; suppresses diagnostics.
–Z security mode; overwrites temporary files with null bytes before unlinking.
Commands and Utilities 1-367