Running emerge
==============

`E'
     Invoke `emerge' on one file.  This command works slightly different
     depending on the file status.

    `Modified'
          Run `emerge-files' with your working file as file A, and the
          latest revision in the repository as file B.

    `Merged'
    `Conflict'
          Run `emerge-files-with-ancestor' with your working file (as
          it was prior to your invocation of `cvs-update') as file A,
          the latest revision in the repository as file B, and the
          revision that you based your local modifications on as
          ancestor.

     *Note:*  When the file status is `Merged' or `Conflict', CVS has
     already performed a merge.  The resulting file is not used in any
     way if you use this command.  If you use the `q' command inside
     `emerge' (to successfully terminate the merge) the file that CVS
     created will be overwritten.