summaryrefslogtreecommitdiff
path: root/lisp/ediff-merg.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ediff-merg.el')
-rw-r--r--lisp/ediff-merg.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 92235b640dc..c4530af58a7 100644
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -1,5 +1,5 @@
;;; ediff-merg.el --- merging utilities
-;;; Copyright (C) 1994 Free Software Foundation, Inc.
+;;; Copyright (C) 1994, 1995 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.sunysb.edu>