summaryrefslogtreecommitdiff
path: root/lisp/ediff-merg.el
Commit message (Expand)AuthorAgeFilesLines
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-111-397/+0
* Add 2010 to copyright years.Glenn Morris2010-01-131-1/+1
* Replace empty `let's with `progn'.Glenn Morris2009-09-131-1/+1
* 2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2009-08-151-5/+7
* Follow commenting conventions.Stefan Monnier2009-01-311-5/+5
* Add 2009 to copyright years.Glenn Morris2009-01-051-1/+1
* * align.el:Lute Kamstra2008-12-031-5/+5
* Remove unnecessary eval-when-compiles and eval-and-compiles.Glenn Morris2008-06-071-1/+1
* Switch to recommended form of GPLv3 permissions notice.Glenn Morris2008-05-061-6/+4
* Simplify compilation requirements.Glenn Morris2008-05-031-3/+1
* Fix up comment convention on the arch-tag lines.Stefan Monnier2008-04-101-1/+1
* 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2008-04-041-6/+3
* Merge from emacs--rel--22Miles Bader2008-01-081-1/+1
|\
| * Add 2008 to copyright years.Glenn Morris2008-01-071-1/+1
* | Load ediff-*.el files silently.Glenn Morris2007-11-271-2/+2
|/
* Switch license to GPLv3 or later.Glenn Morris2007-07-251-1/+1
* Add 2007 to copyright years.Glenn Morris2007-01-211-1/+1
* (ediff-combination-pattern): Fix typo in docstring.Juanma Barranquero2006-12-111-2/+2
* 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2006-02-191-1/+3
* Update years in copyright notice; nfc.Thien-Thi Nguyen2006-02-061-1/+1
* 2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2005-11-041-1/+4
* 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2005-10-061-2/+6
* Update years in copyright notice; nfc.Thien-Thi Nguyen2005-08-061-1/+2
* Update FSF's address.Lute Kamstra2005-07-041-2/+2
* Add arch taglinesMiles Bader2003-09-011-0/+1
* Trailing whitespace deleted.Juanma Barranquero2003-02-041-23/+23
* 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2002-01-081-8/+9
* Doc fix.Pavel Janík2001-12-201-1/+1
* Some fixes to follow coding conventions.Pavel Janík2001-07-161-1/+3
* (state-or-merge): Defvar when compiling.Dave Love2000-11-101-1/+2
* 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2000-10-291-1/+1
* *** empty log message ***Michael Kifer1999-11-251-44/+78
* *** empty log message ***Michael Kifer1999-11-011-18/+65
* new versionMichael Kifer1997-11-011-7/+0
* new versionMichael Kifer1997-09-301-0/+6
* new versionMichael Kifer1997-07-311-3/+3
* new versionMichael Kifer1997-07-171-0/+6
* new versionMichael Kifer1997-05-311-7/+33
* *** empty log message ***Michael Kifer1996-09-201-0/+6
* *** empty log message ***Michael Kifer1996-06-221-4/+6
* *** empty log message ***Michael Kifer1996-02-161-5/+7
* Update FSF's address.Erik Naggum1996-01-141-3/+6
* Comment fixes.Karl Heuer1996-01-051-1/+1
* Moved defsubsts up.Michael Kifer1995-10-141-8/+8
* *** empty log message ***Michael Kifer1995-10-061-1/+1
* Converted xemacs *screen* nomenclature to *frame*.Karl Heuer1995-06-091-34/+37
* Update copyright.Karl Heuer1995-04-071-1/+1
* Initial revisionKarl Heuer1995-03-161-0/+259