aboutsummaryrefslogtreecommitdiffstats
path: root/admin/gitmerge.el
diff options
context:
space:
mode:
authorEli Zaretskii2023-01-01 05:31:12 -0500
committerEli Zaretskii2023-01-01 05:31:12 -0500
commitcae528457cb862dc886a34240c9d4c73035b6659 (patch)
treec2742863568820ff9accae8b5eeac77c54926ab7 /admin/gitmerge.el
parentb394359261c05fe847fac6a2075aa22f9a0eec2f (diff)
downloademacs-cae528457cb862dc886a34240c9d4c73035b6659.tar.gz
emacs-cae528457cb862dc886a34240c9d4c73035b6659.zip
; Add 2023 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 ddd3e184424..a172fa2bc9b 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -1,6 +1,6 @@
1;;; gitmerge.el --- help merge one Emacs branch into another -*- lexical-binding: t; -*- 1;;; gitmerge.el --- help merge one Emacs branch into another -*- lexical-binding: t; -*-
2 2
3;; Copyright (C) 2010-2022 Free Software Foundation, Inc. 3;; Copyright (C) 2010-2023 Free Software Foundation, Inc.
4 4
5;; Authors: David Engster <deng@randomsample.de> 5;; Authors: David Engster <deng@randomsample.de>
6;; Stefan Monnier <monnier@iro.umontreal.ca> 6;; Stefan Monnier <monnier@iro.umontreal.ca>