qmerge

qmerge requires three input files and produces a single output file. The three input files consist of a common ancestor file, and two separate files that are different descendants of that common ancestor file. qmerge merges the changes of the two descendant files to produce the single output file, which contains the changes of both descendant files.

If the edits contained in the two descendant files happen to overlap, qmerge will highlight the overlapped region in the output file so you can manually choose which edits should survive.

qmerge will overwrite any existing output file.

qmerge does not support any type of file wildcards: all filenames must be explicit.

qmerge should only be used for text files.

For a more detailed explanation on how to successfully employ merging and why you might find it useful, try the Advanced Topics Tutorial.

Command Template

qmerge basefile file1 file2 outfile

where:

basefile (required)

Specifies the name of the common ancestor file.

file1 (required)

Specifies the name of the first descendant file.

file2 (required)

Specifies the name of the second descendant file.

outfile (required)

Specifies the name of the output file that qmerge will create.

Example

qmerge foobar.old foobar.1 foobar.2 foobar.mrg
foobar.old is the common ancestor to foobar.1 and foobar.2. This command merges the changes of foobar.1 and foobar.2 into the output file foobar.mrg.

Command Line Utilities

qdelrev

qdiff

qedit

qget

qident

qlock

qlog

qmerge

qmodhdr

qmodrev

qput

qstamp

qunlock

qunstamp

qrecurse