summaryrefslogtreecommitdiff
path: root/lisp/ediff.el
diff options
context:
space:
mode:
authorMichael Kifer <kifer@cs.stonybrook.edu>1998-05-04 22:42:59 +0000
committerMichael Kifer <kifer@cs.stonybrook.edu>1998-05-04 22:42:59 +0000
commit2eb4bdca8a0ed370b55f2553d72529c427ed504d (patch)
treed94d7f26cab07e80f639cbaa50d62b30f4cdab11 /lisp/ediff.el
parent38cf95df42408406f3ed33938eb0ecaeb39507fe (diff)
downloademacs-2eb4bdca8a0ed370b55f2553d72529c427ed504d.tar.gz
new version
Diffstat (limited to 'lisp/ediff.el')
-rw-r--r--lisp/ediff.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el
index 0068ea3efeb..d8ecd0f91a5 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -6,8 +6,8 @@
;; Created: February 2, 1994
;; Keywords: comparing, merging, patching, version control.
-(defconst ediff-version "2.69" "The current version of Ediff")
-(defconst ediff-date "October 10, 1997" "Date of last update")
+(defconst ediff-version "2.70.1" "The current version of Ediff")
+(defconst ediff-date "March 7, 1998" "Date of last update")
;; This file is part of GNU Emacs.