60 commits

Author	SHA1	Message	Date
Glenn Morris	acaf905b11	Add 2012 to FSF copyright years for Emacs files	2012-01-05 01:46:05 -08:00
Juanma Barranquero	fe7a3057a3	Fix typos.	2011-11-20 20:35:27 +01:00
Stefan Monnier	4f91a8160f	Don't quote lambda expressions with `quote'.	2011-05-23 14:57:17 -03:00
Glenn Morris	95df8112a0	Refill some long/short copyright headers.	2011-01-26 00:36:39 -08:00
Glenn Morris	73b0cd5003	Convert consecutive FSF copyright years to ranges.	2011-01-24 20:08:28 -08:00
Glenn Morris	e9bffc61f2	Refill some copyright headers.	2011-01-15 18:21:30 -08:00
Stefan Monnier	77ab81d054	Merge from emacs-23	2011-01-14 12:18:41 -05:00
Glenn Morris	24ac444fbe	Remove some tests for defunct system-types. ... * lisp/vc/ediff-wind.el (ediff-setup-control-frame): * lisp/vc/ediff-ptch.el (ediff-default-backup-extension): * lisp/vc/ediff-diff.el (ediff-shell, ediff-diff-options) (ediff-exec-process): Remove system-types emx, windows-95.	2010-10-08 00:51:19 -07:00
Chong Yidong	bd78fa1d54	Add "Package:" file headers to denote built-in packages.	2010-08-29 12:17:13 -04:00
Juri Linkov	56b2854f30	Move version control related files to the "vc" subdirectory. ... * add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff-diff.el, * ediff.el, ediff-help.el, ediff-hook.el, ediff-init.el, * ediff-merg.el, ediff-mult.el, ediff-ptch.el, ediff-util.el, * ediff-vers.el, ediff-wind.el, emerge.el, log-edit.el, log-view.el, * pcvs-defs.el, pcvs.el, pcvs-info.el, pcvs-parse.el, pcvs-util.el, * smerge-mode.el, vc-annotate.el, vc-arch.el, vc-bzr.el, vc-cvs.el, * vc-dav.el, vc-dir.el, vc-dispatcher.el, vc.el, vc-git.el, * vc-hg.el, vc-hooks.el, vc-mtn.el, vc-rcs.el, vc-sccs.el, vc-svn.el: Move files to the "vc" subdirectory.	2010-06-11 21:51:00 +03:00

Renamed from lisp/ediff-diff.el (Browse further)