Mercurial > emacs

comparison lisp/ediff.el @ 90645:7eeafaaa9eab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 476-489) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 153-160) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-127
author Miles Bader <miles@gnu.org>
date Mon, 30 Oct 2006 08:54:41 +0000
parents b5c13d1564a9 db25befb2938
children dbe3f29e61d6
comparison
equal deleted inserted replaced
90644:9b62e05dedf6 90645:7eeafaaa9eab
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> 6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
7 ;; Created: February 2, 1994 7 ;; Created: February 2, 1994
8 ;; Keywords: comparing, merging, patching, tools, unix 8 ;; Keywords: comparing, merging, patching, tools, unix
9 9
10 (defconst ediff-version "2.81.1" "The current version of Ediff") 10 (defconst ediff-version "2.81.1" "The current version of Ediff")
11 (defconst ediff-date "September 18, 2006" "Date of last update") 11 (defconst ediff-date "October 23, 2006" "Date of last update")
12 12
13 13
14 ;; This file is part of GNU Emacs. 14 ;; This file is part of GNU Emacs.
15 15
16 ;; GNU Emacs is free software; you can redistribute it and/or modify 16 ;; GNU Emacs is free software; you can redistribute it and/or modify