diff options
| author | Po Lu | 2024-01-02 09:47:10 +0800 |
|---|---|---|
| committer | Po Lu | 2024-01-02 09:47:10 +0800 |
| commit | 8e1c56ae46754dd7baedff49a464f078f0e9912d (patch) | |
| tree | 2181ad80108b88c975be1967d292c26d388ba354 /admin/gitmerge.el | |
| parent | 3204825f56040df0a783de4fc99052eabb62b84b (diff) | |
| download | emacs-8e1c56ae46754dd7baedff49a464f078f0e9912d.tar.gz emacs-8e1c56ae46754dd7baedff49a464f078f0e9912d.zip | |
; Add 2024 to copyright years
Diffstat (limited to 'admin/gitmerge.el')
| -rw-r--r-- | admin/gitmerge.el | 2 |
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 @@ | |||
| 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-2023 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2010-2024 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> |