log lisp/ediff-merg.el @ 11050:564cd5b7f42f

age author description
Thu, 16 Mar 1995 22:34:51 +0000 Karl Heuer Initial revision