Running ediff
=============

`e'
     This command works slightly different depending on the version of
     `ediff' and the file status.

     With modern versions of `ediff', this command calls
     `run-ediff-from-cvs-buffer' on one file.

     *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
     `ediff' (to successfully terminate a merge) the file that CVS
     created will be overwritten.

     Older versions of `ediff' use an interface similar to `emerge'.
     If the version of `ediff' you have doesn't support the newer
     `run-ediff-from-cvs-buffer', the function
     `cvs-old-ediff-interface' is invoked.  These older versions do not
     support merging of revisions.

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

    `Merged'
    `Conflict'
          Run `ediff-files3' 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.

    `Updated'
    `Patched'
          Run `ediff-files' with your working file as file A, and a
          given revision in the repository as file B.  You are prompted
          for the revision to ediff against, and you may specify either
          a tag name or a numerical revision number (*note Getting info
          about files::.).