summaryrefslogtreecommitdiff
path: root/lisp/ediff.el
diff options
context:
space:
mode:
authorMichael Kifer <kifer@cs.stonybrook.edu>2007-06-13 20:24:31 +0000
committerMichael Kifer <kifer@cs.stonybrook.edu>2007-06-13 20:24:31 +0000
commit141f0c038a2cbf9cc91fed54ca6aac76120d216d (patch)
treeaf5f64e78af5e6adabf735b375ee9dbe10bf8d4f /lisp/ediff.el
parentecda6582536032e0c8af2a01235f77a2bcda5e07 (diff)
2007-06-13 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-ptch.el (ediff-context-diff-label-regexp): partially undid previous patch
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 c5f5c48f8d..69717ca13a 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -7,8 +7,8 @@
;; Created: February 2, 1994
;; Keywords: comparing, merging, patching, tools, unix
-(defconst ediff-version "2.81.1" "The current version of Ediff")
-(defconst ediff-date "October 23, 2006" "Date of last update")
+(defconst ediff-version "2.81.2" "The current version of Ediff")
+(defconst ediff-date "June 13, 2007" "Date of last update")
;; This file is part of GNU Emacs.