log lisp/ediff-merg.el @ 12997:938dc2491820

age author description
Fri, 09 Jun 1995 14:38:56 +0000 Karl Heuer Converted xemacs *screen* nomenclature to *frame*.
Fri, 07 Apr 1995 01:20:53 +0000 Karl Heuer Update copyright.
Thu, 16 Mar 1995 22:34:51 +0000 Karl Heuer Initial revision