summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-merg.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2022-01-01 02:45:51 -0500
committerEli Zaretskii <eliz@gnu.org>2022-01-01 02:45:51 -0500
commit19dcb237b5b02b36580294ab309124f346a66024 (patch)
treed08a98347336f10265f20c46e3908dc74ef406d3 /lisp/vc/ediff-merg.el
parent8a08af20a8081f3dd419809122d82352633cc87d (diff)
downloademacs-19dcb237b5b02b36580294ab309124f346a66024.tar.gz
; Add 2022 to copyright years.
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 d0ce9d326d8..de8c587b1ca 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-2021 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2022 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: ediff