log lisp/ediff-merg.el @ 112218:376148b31b5e

age author description
Sun, 02 Jan 2011 15:50:46 -0800 Glenn Morris Add 2011 to FSF/AIST copyright years.
Wed, 13 Jan 2010 00:35:10 -0800 Glenn Morris Add 2010 to copyright years.
Sun, 13 Sep 2009 02:14:25 +0000 Glenn Morris Replace empty `let's with `progn'.
Sat, 15 Aug 2009 05:57:08 +0000 Michael Kifer 2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Sat, 31 Jan 2009 22:10:22 +0000 Stefan Monnier Follow commenting conventions.
Mon, 05 Jan 2009 03:18:22 +0000 Glenn Morris Add 2009 to copyright years.
Wed, 03 Dec 2008 05:48:14 +0000 Lute Kamstra * align.el: