Merge branch 'master' into ng/master

* master:
  maint: update copyright years to 2015 (branch 'master')
  maint: update copyright years to 2015 (branch 'micro')

diff --cc GNUmakefile
Simple merge

diff --cc HACKING
Simple merge

diff --cc Makefile.am
index cfb6572b7fa52be339533c54ea76c2b7aa0da713,5fb94e606f2d0a22e4ece89b43680e40cd5397df..a4a8e1ab783029757c8dbe67f00a0e2694e3c25d
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -1,8 -1,8 +1,8 @@@
  ## Process this file with automake to create Makefile.in
  
 -## Makefile for Automake.
 +## Makefile for Automake NG.
  
- # Copyright (C) 1995-2014 Free Software Foundation, Inc.
+ # Copyright (C) 1995-2015 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by

diff --cc bin/Makefile.inc
Simple merge

diff --cc bin/aclocal.in
Simple merge

diff --cc bin/automake.in
Simple merge

diff --cc bootstrap.sh
Simple merge

diff --cc configure.ac
Simple merge

diff --cc contrib/check-html.am
Simple merge

diff --cc contrib/t/Makefile.inc
Simple merge

diff --cc contrib/t/parallel-tests-html-recursive.sh
Simple merge

diff --cc contrib/t/parallel-tests-html.sh
Simple merge

diff --cc contrib/tap-driver.pl
Simple merge

diff --cc doc/Makefile.inc
Simple merge

diff --cc doc/automake-ng.texi
Simple merge

diff --cc gen-testsuite-part
Simple merge

diff --cc lib/Automake/ChannelDefs.pm
Simple merge

diff --cc lib/Automake/Channels.pm
Simple merge

diff --cc lib/Automake/Config.in
Simple merge

diff --cc lib/Automake/DisjConditions.pm
Simple merge

diff --cc lib/Automake/ItemDef.pm
Simple merge

diff --cc lib/Automake/Location.pm
Simple merge

diff --cc lib/Automake/Makefile.inc
Simple merge

diff --cc lib/Automake/Options.pm
Simple merge

diff --cc lib/Automake/Rule.pm
Simple merge

diff --cc lib/Automake/RuleDef.pm
Simple merge

diff --cc lib/Automake/VarDef.pm
Simple merge

diff --cc lib/Automake/Variable.pm
Simple merge

diff --cc lib/Makefile.inc
Simple merge

diff --cc lib/am/Makefile.inc
Simple merge

diff --cc lib/am/compile.am
Simple merge

diff --cc lib/am/configure.am
Simple merge

diff --cc lib/am/data.am
Simple merge

diff --cc lib/am/dejagnu.mk
Simple merge

diff --cc lib/am/depend2.am
Simple merge

diff --cc lib/am/footer.am
Simple merge

diff --cc lib/am/java.am
Simple merge

diff --cc lib/am/lang-compile.am
Simple merge

diff --cc lib/am/lex.am
Simple merge

diff --cc lib/am/library.am
Simple merge

diff --cc lib/am/libs.am
Simple merge

diff --cc lib/am/lisp.am
Simple merge

diff --cc lib/am/ltlib.am
Simple merge

diff --cc lib/am/ltlibrary.am
Simple merge

diff --cc lib/am/mans.am
Simple merge

diff --cc lib/am/program.am
Simple merge

diff --cc lib/am/progs.am
Simple merge

diff --cc lib/am/python.am
Simple merge

diff --cc lib/am/remake-hdr.am
Simple merge

diff --cc lib/am/scripts.am
Simple merge

diff --cc lib/am/subdirs.mk
Simple merge

diff --cc lib/am/texi-vers.am
Simple merge

diff --cc lib/am/yacc.am
Simple merge

diff --cc lib/ar-lib
Simple merge

diff --cc lib/compile
Simple merge

diff --cc lib/depcomp
Simple merge

diff --cc lib/mdate-sh
Simple merge

diff --cc lib/missing
index 4110bbab92222ad38b96cb7ace03287293bef8ac,3af2828918a8d74097f0c188b4dec2b670c318c9..741ec426e1b2e524ea1f91458687fba00719e73c
--- 1/lib/missing
--- 2/lib/missing
+++ b/lib/missing
@@@ -1,9 -1,9 +1,9 @@@
  #! /bin/sh
  # Common wrapper for a few potentially missing GNU programs.
  
 -scriptversion=2013-10-28.13; # UTC
 +scriptversion=2014-12-20.00; # UTC
  
- # Copyright (C) 1996-2014 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2015 Free Software Foundation, Inc.
  # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
  
  # This program is free software; you can redistribute it and/or modify

diff --cc lib/py-compile
Simple merge

diff --cc lib/tap-driver.sh
Simple merge

diff --cc lib/test-driver
Simple merge

diff --cc lib/ylwrap
Simple merge

diff --cc m4/Makefile.inc
Simple merge

diff --cc m4/depend.m4
Simple merge

diff --cc m4/init.m4
index 4a00a90dcd216d2fbbcf80345e0a5a3d75c7f406,723f6005c4707e337890750e1ef6dd6c466bfb5b..79a6d4a732fde0bcac944522898a5d4c81f03bc0
--- 1/m4/init.m4
--- 2/m4/init.m4
+++ b/m4/init.m4
@@@ -1,6 -1,6 +1,6 @@@
 -# Do all the work for Automake.                             -*- Autoconf -*-
 +# Do all the work for Automake-NG.                         -*- Autoconf -*-
  
- # Copyright (C) 1996-2014 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2015 Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,

diff --cc m4/silent.m4
Simple merge

diff --cc m4/strip.m4
Simple merge

diff --cc m4/substnot.m4
Simple merge

diff --cc maintainer/maint.mk
Simple merge

diff --cc maintainer/syntax-checks.mk
index 657de45e0e65b01e611217988e84bd740835c00a,d5fff4825bb1faca776c1a2bb9a9346f72b67308..d8abb467063c462d4e91136c09e2fdada10fe361
--- 1/maintainer/syntax-checks.mk
--- 2/maintainer/syntax-checks.mk
+++ b/maintainer/syntax-checks.mk
@@@ -1,6 -1,6 +1,6 @@@
 -# Maintainer checks for Automake.  Requires GNU make.
 +# Maintainer checks for Automake-NG.
  
- # Copyright (C) 2012-2014 Free Software Foundation, Inc.
+ # Copyright (C) 2012-2015 Free Software Foundation, Inc.
  #
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by

diff --cc t/Makefile.inc
Simple merge

diff --cc t/aclocal-deps.sh
Simple merge

diff --cc t/add-missing-multiple.sh
Simple merge

diff --cc t/add-missing.tap
Simple merge

diff --cc t/all2.sh
Simple merge

diff --cc t/am-default-source-ext.sh
Simple merge

diff --cc t/amopts-variable-expansion.sh
Simple merge

diff --cc t/autodist-aclocal-m4.sh
Simple merge

diff --cc t/autodist-configure-no-subdir.sh
Simple merge

diff --cc t/autodist-stamp-vti.sh
Simple merge

diff --cc t/autodist-subdir.sh
Simple merge

diff --cc t/autodist.sh
Simple merge

diff --cc t/autohdr-subdir-pr12495.sh
Simple merge

diff --cc t/autohdr3.sh
Simple merge

diff --cc t/auxdir.sh
Simple merge

diff --cc t/auxdir6.sh
Simple merge

diff --cc t/auxdir7.sh
Simple merge

diff --cc t/auxdir8.sh
Simple merge

diff --cc t/ax/am-test-lib.sh
Simple merge

diff --cc t/ax/distcheck-hook-m4.am
Simple merge

diff --cc t/ax/runtest.in
Simple merge

diff --cc t/ax/shell-no-trail-bslash.in
Simple merge

diff --cc t/ax/test-lib.sh
Simple merge

diff --cc t/ax/testsuite-summary-checks.sh
Simple merge

diff --cc t/backslash-issues.sh
Simple merge

diff --cc t/built-sources-fork-bomb.sh
Simple merge

diff --cc t/built-sources.sh
Simple merge

diff --cc t/canon.sh
Simple merge

diff --cc t/canon5.sh
Simple merge

diff --cc t/ccnoco3.sh
Simple merge

diff --cc t/check-concurrency-bug9245.sh
Simple merge

diff --cc t/check10.sh
Simple merge

diff --cc t/check12.sh
Simple merge

diff --cc t/check2.sh
Simple merge

diff --cc t/check4.sh
Simple merge

diff --cc t/check5.sh
Simple merge

diff --cc t/check7.sh
Simple merge

diff --cc t/check8.sh
Simple merge

diff --cc t/colon5.sh
Simple merge

diff --cc t/colon6.sh
Simple merge

diff --cc t/colon7.sh
Simple merge

diff --cc t/color-tests.sh
Simple merge

diff --cc t/color-tests2.sh
Simple merge

diff --cc t/comment4.sh
Simple merge

diff --cc t/comment6.sh
Simple merge

diff --cc t/comment8.sh
Simple merge

diff --cc t/cond30.sh
Simple merge

diff --cc t/cond38.sh
Simple merge

diff --cc t/condlib.sh
Simple merge

diff --cc t/condman3.sh
Simple merge

diff --cc t/confdeps.sh
Simple merge

diff --cc t/conffile-leading-dot.sh
Simple merge

diff --cc t/confh.sh
Simple merge

diff --cc t/confh4.sh
Simple merge

diff --cc t/confh8.sh
Simple merge

diff --cc t/conflnk2.sh
Simple merge

diff --cc t/cscope.tap
Simple merge

diff --cc t/cxx-lt-demo.sh
Simple merge

diff --cc t/dejagnu2.sh
Simple merge

diff --cc t/deleted-am.sh
Simple merge

diff --cc t/deleted-m4.sh
Simple merge

diff --cc t/depcomp-implicit-auxdir.sh
Simple merge

diff --cc t/depcomp8a.sh
Simple merge

diff --cc t/depcomp8b.sh
Simple merge

diff --cc t/depdist.sh
Simple merge

diff --cc t/depend.sh
Simple merge

diff --cc t/depend4.sh
Simple merge

diff --cc t/dist-auxfile-2.sh
Simple merge

diff --cc t/dist-auxfile.sh
Simple merge

diff --cc t/dist-formats.tap
Simple merge

diff --cc t/dist-install-sh.sh
Simple merge

diff --cc t/dist-missing-am.sh
Simple merge

diff --cc t/dist-missing-included-m4.sh
Simple merge

diff --cc t/dist-missing-m4.sh
Simple merge

diff --cc t/dist-obsolete-opts.sh
Simple merge

diff --cc t/dist-repeated.sh
Simple merge

diff --cc t/distcheck-configure-flags-am.sh
Simple merge

diff --cc t/distcheck-configure-flags-subpkg.sh
Simple merge

diff --cc t/distcheck-configure-flags.sh
Simple merge

diff --cc t/distcheck-hook.sh
Simple merge

diff --cc t/distcheck-hook2.sh
Simple merge

diff --cc t/distcheck-missing-m4.sh
Simple merge

diff --cc t/distcheck-outdated-m4.sh
Simple merge

diff --cc t/distcheck-override-infodir.sh
Simple merge

diff --cc t/distcheck-pr10470.sh
Simple merge

diff --cc t/distcheck-pr18286.sh
Simple merge

diff --cc t/distcheck-pr9579.sh
Simple merge

diff --cc t/distcom-subdir.sh
Simple merge

diff --cc t/distcom3.sh
Simple merge

diff --cc t/distcom4.sh
Simple merge

diff --cc t/distcom5.sh
Simple merge

diff --cc t/distdir.sh
Simple merge

diff --cc t/distlinksbrk.sh
Simple merge

diff --cc t/dollar.sh
Simple merge

diff --cc t/exeext4.sh
Simple merge

diff --cc t/ext.sh
Simple merge

diff --cc t/ext2.sh
Simple merge

diff --cc t/extra-dist-wildcards-gnu.sh
Simple merge

diff --cc t/extra-dist-wildcards-vpath.sh
Simple merge

diff --cc t/extra-dist-wildcards.sh
Simple merge

diff --cc t/extra-portability.sh
Simple merge

diff --cc t/extra-sources.sh
Simple merge

diff --cc t/flavor.sh
Simple merge

diff --cc t/fort2.sh
Simple merge

diff --cc t/gcj.sh
Simple merge

diff --cc t/gettext-external-pr338.sh
Simple merge

diff --cc t/gnits2.sh
Simple merge

diff --cc t/gnits3.sh
Simple merge

diff --cc t/gnumake.sh
Simple merge

diff --cc t/hdr-vars-defined-once.sh
Simple merge

diff --cc t/installdir.sh
Simple merge

diff --cc t/instdir-ltlib.sh
Simple merge

diff --cc t/instdir-prog.sh
Simple merge

diff --cc t/insthook.sh
Simple merge

diff --cc t/instspc.tap
Simple merge

diff --cc t/java-compile-install.sh
Simple merge

diff --cc t/java-compile-run-flat.sh
Simple merge

diff --cc t/java-compile-run-nested.sh
Simple merge

diff --cc t/java-nobase.sh
Simple merge

diff --cc t/java.sh
Simple merge

diff --cc t/javaflags.sh
Simple merge

diff --cc t/lex-depend-cxx.sh
Simple merge

diff --cc t/lex-depend.sh
Simple merge

diff --cc t/lex-header.sh
Simple merge

diff --cc t/lex-lib-external.sh
Simple merge

diff --cc t/lex-libobj.sh
Simple merge

diff --cc t/lex-line.sh
Simple merge

diff --cc t/lex-multiple.sh
Simple merge

diff --cc t/lex-nodist.sh
Simple merge

diff --cc t/lex-noyywrap.sh
Simple merge

diff --cc t/lex-subobj-nodep.sh
Simple merge

diff --cc t/lex3.sh
Simple merge

diff --cc t/lex5.sh
Simple merge

diff --cc t/lflags-cxx.sh
Simple merge

diff --cc t/lflags.sh
Simple merge

diff --cc t/libobj19.sh
Simple merge

diff --cc t/libobj20b.sh
Simple merge

diff --cc t/libobj20c.sh
Simple merge

diff --cc t/libobj7.sh
Simple merge

diff --cc t/library2.sh
Simple merge

diff --cc t/libtoo10.sh
Simple merge

diff --cc t/libtool3.sh
Simple merge

diff --cc t/libtool7.sh
Simple merge

diff --cc t/link_cond.sh
Simple merge

diff --cc t/lisp-flags.sh
Simple merge

diff --cc t/lisp8.sh
Simple merge

diff --cc t/location.sh
Simple merge

diff --cc t/longline.sh
Simple merge

diff --cc t/make-dryrun.tap
Simple merge

diff --cc t/make-keepgoing.tap
Simple merge

diff --cc t/makej.sh
Simple merge

diff --cc t/makej2.sh
Simple merge

diff --cc t/maken.sh
Simple merge

diff --cc t/maken3.sh
Simple merge

diff --cc t/man3.sh
Simple merge

diff --cc t/man6.sh
Simple merge

diff --cc t/man8.sh
Simple merge

diff --cc t/mkinst3.sh
Simple merge

diff --cc t/no-extra-makefile-code.sh
Simple merge

diff --cc t/no-spurious-install-recursive.sh
Simple merge

diff --cc t/nodist.sh
Simple merge

diff --cc t/nodist3.sh
Simple merge

diff --cc t/noinst.sh
Simple merge

diff --cc t/nostdinc.sh
Simple merge

diff --cc t/objc-basic.sh
Simple merge

diff --cc t/objcxx-basic.sh
Simple merge

diff --cc t/output11.sh
Simple merge

diff --cc t/output6.sh
Simple merge

diff --cc t/override-conditional-1.sh
Simple merge

diff --cc t/parallel-tests-basics.sh
Simple merge

diff --cc t/parallel-tests-concurrency-2.sh
Simple merge

diff --cc t/parallel-tests-concurrency.sh
Simple merge

diff --cc t/parallel-tests-empty.sh
Simple merge

diff --cc t/parallel-tests-exeext.sh
Simple merge

diff --cc t/parallel-tests-extra-programs.sh
Simple merge

diff --cc t/parallel-tests-fd-redirect-exeext.sh
Simple merge

diff --cc t/parallel-tests-fd-redirect.sh
Simple merge

diff --cc t/parallel-tests-fork-bomb.sh
Simple merge

diff --cc t/parallel-tests-generated-and-distributed.sh
Simple merge

diff --cc t/parallel-tests-harderror.sh
Simple merge

diff --cc t/parallel-tests-log-override.sh
Simple merge

diff --cc t/parallel-tests-logvars-example.sh
Simple merge

diff --cc t/parallel-tests-recheck-pr11791.sh
Simple merge

diff --cc t/parallel-tests-recheck.sh
Simple merge

diff --cc t/parallel-tests-srcdir-in-test-name.sh
Simple merge

diff --cc t/parallel-tests-unreadable.sh
Simple merge

diff --cc t/pattern-rules.sh
Simple merge

diff --cc t/pattern-rules2.sh
Simple merge

diff --cc t/per-target-flags.sh
Simple merge

diff --cc t/phony.sh
Simple merge

diff --cc t/pluseq3.sh
Simple merge

diff --cc t/posixsubst-ldadd.sh
Simple merge

diff --cc t/posixsubst-libraries.sh
Simple merge

diff --cc t/posixsubst-ltlibraries.sh
Simple merge

diff --cc t/posixsubst-sources.sh
Simple merge

diff --cc t/pr2.sh
Simple merge

diff --cc t/pr224.sh
Simple merge

diff --cc t/pr401.sh
Simple merge

diff --cc t/pr401b.sh
Simple merge

diff --cc t/pr401c.sh
Simple merge

diff --cc t/pr87.sh
Simple merge

diff --cc t/pr9.sh
Simple merge

diff --cc t/preproc-errmsg.sh
Simple merge

diff --cc t/primary-prefix-couples-force-valid.sh
Simple merge

diff --cc t/python-virtualenv.sh
Simple merge

diff --cc t/recurs-user-keep-going.sh
Simple merge

diff --cc t/recurs-user-phony.sh
Simple merge

diff --cc t/recurs-user-wrap.sh
Simple merge

diff --cc t/relativize.tap
Simple merge

diff --cc t/remake-after-acinclude-m4.sh
Simple merge

diff --cc t/remake-after-aclocal-m4.sh
Simple merge

diff --cc t/remake-after-configure-ac.sh
Simple merge

diff --cc t/remake-after-makefile-am.sh
Simple merge

diff --cc t/remake-all-1.sh
Simple merge

diff --cc t/remake-config-status-dependencies.sh
Simple merge

diff --cc t/remake-configure-dependencies.sh
Simple merge

diff --cc t/remake-deleted-m4-file.sh
Simple merge

diff --cc t/remake-gnulib-add-acsubst.sh
Simple merge

diff --cc t/remake-gnulib-add-header.sh
Simple merge

diff --cc t/remake-gnulib-remove-header.sh
Simple merge

diff --cc t/remake-include-aclocal.sh
Simple merge

diff --cc t/remake-include-configure.sh
Simple merge

diff --cc t/remake-include-makefile.sh
Simple merge

diff --cc t/remake-makefile-intree.sh
Simple merge

diff --cc t/remake-makefile-vpath.sh
Simple merge

diff --cc t/remake-mild-stress.sh
Simple merge

diff --cc t/remake-moved-m4-file.sh
Simple merge

diff --cc t/remake-not-after-make-dist.sh
Simple merge

diff --cc t/remake-recurs-user.sh
Simple merge

diff --cc t/remake-renamed-am.sh
Simple merge

diff --cc t/remake-renamed-m4-file.sh
Simple merge

diff --cc t/remake-renamed-m4-macro-and-file.sh
Simple merge

diff --cc t/remake-renamed-m4-macro.sh
Simple merge

diff --cc t/remake-subdir-from-subdir.sh
Simple merge

diff --cc t/remake-subdir-gnu.sh
Simple merge

diff --cc t/remake-subdir-grepping.sh
Simple merge

diff --cc t/remake-subdir-long-time.sh
Simple merge

diff --cc t/remake-subdir.sh
Simple merge

diff --cc t/remake-timing-bug-pr8365.sh
Simple merge

diff --cc t/repeated-options.sh
Simple merge

diff --cc t/self-check-dir.tap
Simple merge

diff --cc t/self-check-shell-no-trail-bslash.sh
Simple merge

diff --cc t/serial-tests.sh
Simple merge

diff --cc t/silent-c.sh
Simple merge

diff --cc t/silent-configsite.sh
Simple merge

diff --cc t/silent-custom.sh
Simple merge

diff --cc t/silent-cxx.sh
Simple merge

diff --cc t/silent-f77.sh
Simple merge

diff --cc t/silent-f90.sh
Simple merge

diff --cc t/silent-lex.sh
Simple merge

diff --cc t/silent-lt.sh
Simple merge

diff --cc t/silent-many-languages.sh
Simple merge

diff --cc t/silent-texi.sh
Simple merge

diff --cc t/silent-yacc.sh
Simple merge

diff --cc t/specflg-dummy.sh
Simple merge

diff --cc t/specflg6.sh
Simple merge

diff --cc t/spell.sh
Simple merge

diff --cc t/spell2.sh
Simple merge

diff --cc t/subdir-keep-going-pr12554.sh
Simple merge

diff --cc t/subdir-order.sh
Simple merge

diff --cc t/subdir.sh
Simple merge

diff --cc t/subobj-clean-lt-pr10697.sh
Simple merge

diff --cc t/subobj-clean-pr10697.sh
Simple merge

diff --cc t/subobj-cxx-grep.sh
Simple merge

diff --cc t/subobj10.sh
Simple merge

diff --cc t/subobj11a.sh
Simple merge

diff --cc t/subobj5.sh
Simple merge

diff --cc t/subobj8.sh
Simple merge

diff --cc t/subobj9.sh
Simple merge

diff --cc t/subpkg-yacc.sh
Simple merge

diff --cc t/substref.sh
Simple merge

diff --cc t/suffix-chain.sh
Simple merge

diff --cc t/suffix-custom-subobj-and-specflg.sh
Simple merge

diff --cc t/suffix-custom-subobj.sh
Simple merge

diff --cc t/suffix-obj.sh
Simple merge

diff --cc t/suffix.sh
Simple merge

diff --cc t/suffix10.sh
Simple merge

diff --cc t/suffix2.sh
Simple merge

diff --cc t/suffix5.sh
Simple merge

diff --cc t/suffix8.sh
Simple merge

diff --cc t/suffix9.sh
Simple merge

diff --cc t/tags-id.sh
Simple merge

diff --cc t/tags-pr12372.sh
Simple merge

diff --cc t/tap-bad-prog.tap
Simple merge

diff --cc t/tap-basic.sh
Simple merge

diff --cc t/tap-color.sh
Simple merge

diff --cc t/tap-common-setup.sh
Simple merge

diff --cc t/tap-deps.sh
Simple merge

diff --cc t/tap-diagnostic-custom.sh
Simple merge

diff --cc t/tap-diagnostic.sh
Simple merge

diff --cc t/tap-doc.sh
Simple merge

diff --cc t/tap-doc2.sh
Simple merge

diff --cc t/tap-lazy-check.sh
Simple merge

diff --cc t/tap-log.sh
Simple merge

diff --cc t/tap-more.sh
Simple merge

diff --cc t/tap-more2.sh
Simple merge

diff --cc t/tap-passthrough-exit.sh
Simple merge

diff --cc t/tap-passthrough.sh
Simple merge

diff --cc t/tap-recheck.sh
Simple merge

diff --cc t/tap-signal.tap
Simple merge

diff --cc t/tap-todo-skip.sh
Simple merge

diff --cc t/targetclash.sh
Simple merge

diff --cc t/test-driver-acsubst.sh
Simple merge

diff --cc t/test-driver-cond.sh
Simple merge

diff --cc t/test-driver-create-log-dir.sh
Simple merge

diff --cc t/test-driver-custom-multitest-recheck.sh
Simple merge

diff --cc t/test-driver-custom-multitest-recheck2.sh
Simple merge

diff --cc t/test-driver-custom-multitest.sh
Simple merge

diff --cc t/test-driver-custom-xfail-tests.sh
Simple merge

diff --cc t/test-driver-custom.sh
Simple merge

diff --cc t/test-driver-fail.sh
Simple merge

diff --cc t/test-driver-is-distributed.sh
Simple merge

diff --cc t/test-driver-strip-vpath.sh
Simple merge

diff --cc t/test-extensions-cond.sh
Simple merge

diff --cc t/test-extensions-invalid.sh
Simple merge

diff --cc t/test-log.sh
Simple merge

diff --cc t/test-metadata-global-log.sh
Simple merge

diff --cc t/test-metadata-global-result.sh
Simple merge

diff --cc t/test-metadata-recheck.sh
Simple merge

diff --cc t/test-metadata-results.sh
Simple merge

diff --cc t/test-missing.sh
Simple merge

diff --cc t/test-trs-basic.sh
Simple merge

diff --cc t/test-trs-recover-parallel.sh
Simple merge

diff --cc t/test-trs-recover.sh
Simple merge

diff --cc t/testsuite-summary-count-many.sh
Simple merge

diff --cc t/transform3.sh
Simple merge

diff --cc t/txinfo-add-missing-and-dist.sh
Simple merge

diff --cc t/txinfo-builddir.sh
Simple merge

diff --cc t/txinfo-many-output-formats-vpath.sh
Simple merge

diff --cc t/txinfo-many-output-formats.sh
Simple merge

diff --cc t/txinfo-no-extra-dist.sh
Simple merge

diff --cc t/txinfo-setfilename-repeated.sh
Simple merge

diff --cc t/txinfo-tex-dist.sh
Simple merge

diff --cc t/txinfo-vtexi.sh
Simple merge

diff --cc t/txinfo-vtexi3.sh
Simple merge

diff --cc t/txinfo-vtexi4.sh
Simple merge

diff --cc t/uninstall-fail.sh
Simple merge

diff --cc t/vala-headers.sh
Simple merge

diff --cc t/vala-libs.sh
Simple merge

diff --cc t/vala-mix.sh
Simple merge

diff --cc t/vala-mix2.sh
Simple merge

diff --cc t/vala-non-recursive-setup.sh
Simple merge

diff --cc t/vala-parallel.sh
Simple merge

diff --cc t/vala-per-target-flags.sh
Simple merge

diff --cc t/vala-recursive-setup.sh
Simple merge

diff --cc t/vala-vapi.sh
Simple merge

diff --cc t/vala-vpath.sh
Simple merge

diff --cc t/vars-assign.sh
Simple merge

diff --cc t/vartar.sh
Simple merge

diff --cc t/vartypos.sh
Simple merge

diff --cc t/version7.sh
Simple merge

diff --cc t/vpath.sh
Simple merge

diff --cc t/warning-groups-win-over-strictness.sh
Simple merge

diff --cc t/warnings-override.sh
Simple merge

diff --cc t/warnings-precedence.sh
Simple merge

diff --cc t/warnings-strictness-interactions.sh
Simple merge

diff --cc t/warnings-win-over-strictness.sh
Simple merge

diff --cc t/warnopts.sh
Simple merge

diff --cc t/werror.sh
Simple merge

diff --cc t/werror2.sh
Simple merge

diff --cc t/werror3.sh
Simple merge

diff --cc t/yacc-auxdir.sh
Simple merge

diff --cc t/yacc-basic.sh
Simple merge

diff --cc t/yacc-bison-skeleton-cxx.sh
Simple merge

diff --cc t/yacc-bison-skeleton.sh
Simple merge

diff --cc t/yacc-cxx.sh
Simple merge

diff --cc t/yacc-d-basic.sh
Simple merge

diff --cc t/yacc-d-cxx.sh
Simple merge

diff --cc t/yacc-deleted-headers.sh
Simple merge

diff --cc t/yacc-depend2.sh
Simple merge

diff --cc t/yacc-dist-nobuild-subdir.sh
Simple merge

diff --cc t/yacc-dist-nobuild.sh
Simple merge

diff --cc t/yacc-grepping2.sh
Simple merge

diff --cc t/yacc-line.sh
Simple merge

diff --cc t/yacc-mix-c-cxx.sh
Simple merge

diff --cc t/yacc-nodist.sh
Simple merge

diff --cc t/yacc-subdir.sh
Simple merge

diff --cc t/yflags-cmdline-override.sh
Simple merge

diff --cc t/yflags-cxx.sh
Simple merge

diff --cc t/yflags.sh
Simple merge