diff options
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 1058088cce9..bcf32f12e7f 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; gitmerge.el --- help merge one Emacs branch into another | 1 | ;;; gitmerge.el --- help merge one Emacs branch into another |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2010-2018 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2010-2019 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> |