The result file can be saved at any time, whether all the
conflicts are solved or not.
If all the conflicts are
solved, the saved file is a
simple flat file as are the input
files.
If some
conflicts remain, the saved file includes
text markers which can be interpreted later with the
Document / Comparison/Merge / Open Conflict
File... menu.
The output location selectors allow to select the output
places. If you work in place, you may select Left, Right and
Ancestor (for 3-way merges). You may as well select an
additional Other place to keep your source documents safe.
You can select
several output places: one or more from the input files, and
the "other" location.
The "other" location can be used when you wish to partially
merge files to integrate only some of the modifications you
have made in the local version.
You can select
several output places: one or more from the input files, and
the "other" location.