log lisp/ediff-merg.el @ 64215:a4c59075cac8

age author description
Mon, 04 Jul 2005 23:32:44 +0000 Lute Kamstra Update FSF's address.
Mon, 01 Sep 2003 15:45:59 +0000 Miles Bader Add arch taglines
Tue, 04 Feb 2003 11:26:42 +0000 Juanma Barranquero Trailing whitespace deleted.