summaryrefslogtreecommitdiff
path: root/lisp/ediff-merg.el
Commit message (Expand)AuthorAgeFilesLines
* 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