**** EDIFF -- a comprehensive interface to diff for Emacs 19

This directory:

README	    	-- This file
Makefile	-- Automated installation file
ediff.texi	-- Manual in Texinfo format
ediff		-- The Info file
ediff.dvi	-- Manual in DVI format

ediff.el    	-- Ediff Emacs Lisp code
ediff-init.el	-- Ediff Emacs Lisp code
ediff-wind.el	-- Ediff Emacs Lisp code
ediff-util.el	-- Ediff Emacs Lisp code
ediff-diff.el	-- Ediff Emacs Lisp code
ediff-merg.el	-- Ediff Emacs Lisp code


To install Ediff do:

		uncompress ediff.shar.Z
		tar xf ediff.shar


Then do the following:

1. To compile Lisp:
		
      	    	make  (or 'make all')
   
2. You can also type

	       make install
	       
   to do what "make all" does plus it will copy the files ediff*.elc
   into a suitable Lisp directory.
   
   To make this happen, you will most likely have to change the PREFIX
   variable in Makefile and, possibly, one or more of these variables:
   
   	DATADIR, LISPDIR, INFODIR, ETCDIR, and VERSION
	
   if they don't point to the right directories in your installation.
   You also need to have a write permission for all directories
   mentioned in LISPDIR, INFODIR, and ETCDIR.
   
3. XEmacs users must invoke `make' with the parameter EMACS=xemacs
   or whatever name is used to invoke XEmacs (some sites still use xemacs
   for Emacs 18).

For manual installation, copy ediff*.elc into a directory on your load-path.

For more details, read documentation at the beginning of the file ediff.el

To install on-line documentation, you need to install the Info files
by copying the file

ediff

into your Info directory (which is emacs-root-dir/info,
if emacs-root-dir is the root directory where Emacs is installed).
(In XEmacs, copy ediff into the file ediff.info in emacs-root-dir/info).

Then edit the file 

emacs-root-dir/info/dir

to include the root menu item for Ediff (check how other menu
items look like in this file). 

In Emacs, this item should look like this:

*  Ediff: (ediff).    	A Visual Interface to Unix Diff and Patch Utilities

In XEmacs, it looks like:

*  Ediff::        A Visual Interface to Unix Diff and Patch Utilities
