log lisp/ediff-merg.el @ 11381:e5591c7b9e17

age author description
Fri, 07 Apr 1995 01:20:53 +0000 Karl Heuer Update copyright.
Thu, 16 Mar 1995 22:34:51 +0000 Karl Heuer Initial revision