summaryrefslogtreecommitdiff
path: root/lisp/ediff-merg.el
Commit message (Expand)AuthorAgeFilesLines
* Update copyright.Karl Heuer1995-04-071-1/+1
* Initial revisionKarl Heuer1995-03-161-0/+259