summaryrefslogtreecommitdiff
path: root/admin/gitmerge.el
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2024-01-02 09:47:10 +0800
committerPo Lu <luangruo@yahoo.com>2024-01-02 09:47:10 +0800
commit8e1c56ae46754dd7baedff49a464f078f0e9912d (patch)
tree2181ad80108b88c975be1967d292c26d388ba354 /admin/gitmerge.el
parent3204825f56040df0a783de4fc99052eabb62b84b (diff)
downloademacs-8e1c56ae46754dd7baedff49a464f078f0e9912d.tar.gz
; Add 2024 to copyright years
Diffstat (limited to 'admin/gitmerge.el')
-rw-r--r--admin/gitmerge.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index a172fa2bc9b..63b11c68007 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -1,6 +1,6 @@
;;; gitmerge.el --- help merge one Emacs branch into another -*- lexical-binding: t; -*-
-;; Copyright (C) 2010-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2024 Free Software Foundation, Inc.
;; Authors: David Engster <deng@randomsample.de>
;; Stefan Monnier <monnier@iro.umontreal.ca>