diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2021-01-01 01:13:56 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-01-01 01:13:56 -0800 |
| commit | ba05d005e5a81bc123ad8da928b1bccb6b160e7a (patch) | |
| tree | eabc024e6b9b0ac4ffcf6fb98c324229ac9c9209 /admin/gitmerge.el | |
| parent | 841e40db5458555c952257a42eaca4a51dfefdae (diff) | |
| download | emacs-ba05d005e5a81bc123ad8da928b1bccb6b160e7a.tar.gz | |
Update copyright year to 2021
Run "TZ=UTC0 admin/update-copyright".
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 18da466aaa1..1364bdc67ac 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -1,6 +1,6 @@ ;;; gitmerge.el --- help merge one Emacs branch into another -;; Copyright (C) 2010-2020 Free Software Foundation, Inc. +;; Copyright (C) 2010-2021 Free Software Foundation, Inc. ;; Authors: David Engster <deng@randomsample.de> ;; Stefan Monnier <monnier@iro.umontreal.ca> |