diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-31 17:57:29 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-31 17:57:29 -0800 |
| commit | ba809612c06bcabd05dcbaae79da39dcb0925992 (patch) | |
| tree | 2e2047c81e96710011e49fc0e492d3c58df442b5 /test/lisp/vc | |
| parent | d9ba26ec2d56e8407094571769c847b78e7c524e (diff) | |
| parent | 2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff) | |
| download | emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz | |
Merge from origin/emacs-26
2fcf2df Fix copyright years by hand
26bed8b Update copyright year to 2019
2814292 Fix value of default frame height. (Bug#33921)
Diffstat (limited to 'test/lisp/vc')
| -rw-r--r-- | test/lisp/vc/add-log-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/vc/diff-mode-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/vc/ediff-diff-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/vc/ediff-ptch-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/vc/smerge-mode-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/vc/vc-bzr-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/vc/vc-hg-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/vc/vc-tests.el | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/test/lisp/vc/add-log-tests.el b/test/lisp/vc/add-log-tests.el index cced7e43557..21b82ffbca1 100644 --- a/test/lisp/vc/add-log-tests.el +++ b/test/lisp/vc/add-log-tests.el @@ -1,6 +1,6 @@ ;;; add-log-tests.el --- Test suite for add-log. -;; Copyright (C) 2013-2018 Free Software Foundation, Inc. +;; Copyright (C) 2013-2019 Free Software Foundation, Inc. ;; Author: Masatake YAMATO <yamato@redhat.com> ;; Keywords: vc tools diff --git a/test/lisp/vc/diff-mode-tests.el b/test/lisp/vc/diff-mode-tests.el index 7900e41b257..4276974c2ac 100644 --- a/test/lisp/vc/diff-mode-tests.el +++ b/test/lisp/vc/diff-mode-tests.el @@ -1,4 +1,4 @@ -;; Copyright (C) 2017-2018 Free Software Foundation, Inc. +;; Copyright (C) 2017-2019 Free Software Foundation, Inc. ;; Author: Dima Kogan <dima@secretsauce.net> ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/vc/ediff-diff-tests.el b/test/lisp/vc/ediff-diff-tests.el index bd9f018221c..b41486261b9 100644 --- a/test/lisp/vc/ediff-diff-tests.el +++ b/test/lisp/vc/ediff-diff-tests.el @@ -1,6 +1,6 @@ ;;; ediff-diff-tests.el --- Unit tests for ediff-diff.el -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2018 Free Software Foundation, Inc. +;; Copyright (C) 2017-2019 Free Software Foundation, Inc. ;; Author: Philipp Stephani <phst@google.com> diff --git a/test/lisp/vc/ediff-ptch-tests.el b/test/lisp/vc/ediff-ptch-tests.el index 123fae57a0f..73e1098ae68 100644 --- a/test/lisp/vc/ediff-ptch-tests.el +++ b/test/lisp/vc/ediff-ptch-tests.el @@ -1,6 +1,6 @@ ;;; ediff-ptch-tests.el --- Tests for ediff-ptch.el -;; Copyright (C) 2016-2018 Free Software Foundation, Inc. +;; Copyright (C) 2016-2019 Free Software Foundation, Inc. ;; Author: Tino Calancha <tino.calancha@gmail.com> diff --git a/test/lisp/vc/smerge-mode-tests.el b/test/lisp/vc/smerge-mode-tests.el index 6004c588dae..032afa9dc24 100644 --- a/test/lisp/vc/smerge-mode-tests.el +++ b/test/lisp/vc/smerge-mode-tests.el @@ -1,4 +1,4 @@ -;; Copyright (C) 2017-2018 Free Software Foundation, Inc. +;; Copyright (C) 2017-2019 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el index 6b96f3b928d..8fa16cdccb1 100644 --- a/test/lisp/vc/vc-bzr-tests.el +++ b/test/lisp/vc/vc-bzr-tests.el @@ -1,6 +1,6 @@ ;;; vc-bzr.el --- tests for vc/vc-bzr.el -;; Copyright (C) 2011-2018 Free Software Foundation, Inc. +;; Copyright (C) 2011-2019 Free Software Foundation, Inc. ;; Author: Glenn Morris <rgm@gnu.org> ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/vc/vc-hg-tests.el b/test/lisp/vc/vc-hg-tests.el index a0a0c1ea4b7..1bdc3204c03 100644 --- a/test/lisp/vc/vc-hg-tests.el +++ b/test/lisp/vc/vc-hg-tests.el @@ -1,6 +1,6 @@ ;;; vc-hg-tests.el --- tests for vc/vc-hg.el -;; Copyright (C) 2016-2018 Free Software Foundation, Inc. +;; Copyright (C) 2016-2019 Free Software Foundation, Inc. ;; Author: Dmitry Gutov <dgutov@yandex.ru> ;; Maintainer: emacs-devel@gnu.org diff --git a/test/lisp/vc/vc-tests.el b/test/lisp/vc/vc-tests.el index cd774d301df..0e61d2a767a 100644 --- a/test/lisp/vc/vc-tests.el +++ b/test/lisp/vc/vc-tests.el @@ -1,6 +1,6 @@ ;;; vc-tests.el --- Tests of different backends of vc.el -;; Copyright (C) 2014-2018 Free Software Foundation, Inc. +;; Copyright (C) 2014-2019 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> |