summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-merg.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/vc/ediff-merg.el')
-rw-r--r--lisp/vc/ediff-merg.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el
index 1c1d5219c7b..826cad9cc1b 100644
--- a/lisp/vc/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -1,6 +1,6 @@
;;; ediff-merg.el --- merging utilities -*- lexical-binding:t -*-
-;; Copyright (C) 1994-2020 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2021 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: ediff