Mercurial > emacs

comparison lisp/ediff.el @ 21940:f7e788ea680b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new version
author Michael Kifer <kifer@cs.stonybrook.edu>
date Mon, 04 May 1998 22:42:59 +0000
parents f44ff2c52fac
children 5c9c0bd0a408
comparison
equal deleted inserted replaced
21939:e9014d2166a4 21940:f7e788ea680b
4 4
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> 5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
6 ;; Created: February 2, 1994 6 ;; Created: February 2, 1994
7 ;; Keywords: comparing, merging, patching, version control. 7 ;; Keywords: comparing, merging, patching, version control.
8 8
9 (defconst ediff-version "2.69" "The current version of Ediff") 9 (defconst ediff-version "2.70.1" "The current version of Ediff")
10 (defconst ediff-date "October 10, 1997" "Date of last update") 10 (defconst ediff-date "March 7, 1998" "Date of last update")
11 11
12 12
13 ;; This file is part of GNU Emacs. 13 ;; This file is part of GNU Emacs.
14 14
15 ;; GNU Emacs is free software; you can redistribute it and/or modify 15 ;; GNU Emacs is free software; you can redistribute it and/or modify