Mercurial > emacs
comparison lisp/ediff.el @ 20003:9bc6a4017c8c
new version
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Tue, 30 Sep 1997 01:13:53 +0000 |
parents | 1ecc4a79d048 |
children | f44ff2c52fac |
comparison
equal
deleted
inserted
replaced
20002:e89847e2df84 | 20003:9bc6a4017c8c |
---|---|
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.67" "The current version of Ediff") | 9 (defconst ediff-version "2.671" "The current version of Ediff") |
10 (defconst ediff-date "September 3, 1997" "Date of last update") | 10 (defconst ediff-date "September 23, 1997" "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 |