=======================================================
CONTRIBUTOR:    Engineering Staff, Atria Software, Inc.
=======================================================

**********************************************************
************** THIS IS UNSUPPORTED SOFTWARE **************
**********************************************************

**********************************************************
*  Atria makes no representation that the descriptions   *
*   and software code contained in this document will    *
*   not infringe on existing or future patent rights,    *
*     copyrights, trademarks, trade secrets or other     *
*        proprietary rights of third parties. The        *
*     descriptions contained herein do not imply the     *
*  granting of licenses to make, use, sell, license or   *
*  otherwise transfer Atria products described herein.   *
*  Atria disclaims responsibility for errors which may   *
*  appear in this document, and it reserves the right,   *
*   in its sole discretion and without notice, to make   *
*  substitutions and modifications in the products and   *
*         practices described in this document.          *
**********************************************************

--------------------------------------------
T0003: MERGE AN ENTIRE TREE OF FILE ELEMENTS
--------------------------------------------

OVERVIEW
--------

This procedure performs mergers of the file elements in one or more
directory trees. It finds all the file elements for which a merger is
required from one specified branch (e.g. /main/bugfix) to another
specified branch (e.g. /main). It checks out the elements and performs
completely automated mergers on as many of the elements as possible.
For the remaining elements, a manual merger is required; the procedure
either invokes the graphical merge tool ("xmerge" command) or lists
the corresponding command lines, for future use.

SCRIPTS
-------

merge_files
        perform all required file-element mergers in one or more
        directory trees