Merge branch 'micro' into maint

* micro:
  tests: remove exec bit from all of them ('micro' branch)
  maint: tests no longer need to have executable bit set

diff --cc HACKING
Simple merge

diff --cc maintainer/syntax-checks.mk
Simple merge

diff --cc t/aclocal-I-and-install.sh
index 7c1b0d403e642d79af9658ff4bc5de2c40c8ce7d,632e816b610890259892cd75f7831cf7c982190c..7c1b0d403e642d79af9658ff4bc5de2c40c8ce7d
mode 100755,100644..100644
--- 1/t/aclocal-I-and-install.sh
--- 2/t/acloca10.sh
+++ b/t/aclocal-I-and-install.sh

diff --cc t/aclocal-I-order-2.sh
index c3fe00a9521d34fc30f05d886f2f4d38456be735,fd58b4efc9cd10cea3f7228dae3cce8781846f95..c3fe00a9521d34fc30f05d886f2f4d38456be735
mode 100755,100644..100644
--- 1/t/aclocal-I-order-2.sh
--- 2/t/aclocal-I-order-2.sh
+++ b/t/aclocal-I-order-2.sh

diff --cc t/aclocal-I-order-3.sh
index 4fcbf4c99685dcaf9556095738ab7465f321a48f,d2077fe9297a154218f2e00c4bf8d60440c9749a..4fcbf4c99685dcaf9556095738ab7465f321a48f
mode 100755,100644..100644
--- 1/t/aclocal-I-order-3.sh
--- 2/t/aclocal-I-order-3.sh
+++ b/t/aclocal-I-order-3.sh

diff --cc t/aclocal-pr450.sh
index 184cc335c085a21a9dce9e8f4192165e1ec2073e,7f4796f53f9d42acebe6c358bac9c620e49156ce..184cc335c085a21a9dce9e8f4192165e1ec2073e
mode 100755,100644..100644
--- 1/t/aclocal-pr450.sh
--- 2/t/aclocal-pr450.sh
+++ b/t/aclocal-pr450.sh

diff --cc t/acsubst2.sh
index fc7c9ad179d536e64254e413ed07bf18a6853d3e,2428dc2a878a0b62b1ba347619e2d3d38fd15665..fc7c9ad179d536e64254e413ed07bf18a6853d3e
mode 100755,100644..100644
--- 1/t/acsubst2.sh
--- 2/t/acsubst2.sh
+++ b/t/acsubst2.sh

diff --cc t/add-missing.tap
index 053b9a111d831263203eb2202fce770dc4cbc0d6,f74c2fd93ccfcc788c886e2a1f03128febab39cb..053b9a111d831263203eb2202fce770dc4cbc0d6
mode 100755,100644..100644
--- 1/t/add-missing.tap
--- 2/t/add-missing.tap
+++ b/t/add-missing.tap

diff --cc t/c-demo.sh
index a0012e2cc807354dbeb378ce9ff97ce387e17270,df2fc5540b327e2f355cc7e5eeecf2275bf86d5c..a0012e2cc807354dbeb378ce9ff97ce387e17270
mode 100755,100644..100644
--- 1/t/c-demo.sh
--- 2/t/c-demo.sh
+++ b/t/c-demo.sh

diff --cc t/ccnoco.sh
index be9be375e00edcbf2645dd7be74a102a22f14780,cffabd7d1e21955a52050170823acb65fa4a2c58..be9be375e00edcbf2645dd7be74a102a22f14780
mode 100755,100644..100644
--- 1/t/ccnoco.sh
--- 2/t/ccnoco.sh
+++ b/t/ccnoco.sh

diff --cc t/ccnoco3.sh
index baf3bdfd08f9232ebae0f2dce46e6282e500f535,7ad5b3bc500cc782c5d72d3356a4d644aa5114fb..baf3bdfd08f9232ebae0f2dce46e6282e500f535
mode 100755,100644..100644
--- 1/t/ccnoco3.sh
--- 2/t/ccnoco3.sh
+++ b/t/ccnoco3.sh

diff --cc t/check8.sh
index 743d1bd00cedca4cfa1f9a77f95a606dcdf65f59,a486147645b35f5979c2b030e398af65cc42e995..743d1bd00cedca4cfa1f9a77f95a606dcdf65f59
mode 100755,100644..100644
--- 1/t/check8.sh
--- 2/t/check8.sh
+++ b/t/check8.sh

diff --cc t/compile4.sh
index ddabe3143a9c246b179a312cccc13c261891aef1,a06aa872950921721ab92bc4f9e4d0bbba706acc..ddabe3143a9c246b179a312cccc13c261891aef1
mode 100755,100644..100644
--- 1/t/compile4.sh
--- 2/t/compile4.sh
+++ b/t/compile4.sh

diff --cc t/cond11.sh
index 7d729d8f10f4725db8d729619aa06561a63c599a,03c4077ad46b2436f3163e7693678bb38ce91e06..7d729d8f10f4725db8d729619aa06561a63c599a
mode 100755,100644..100644
--- 1/t/cond11.sh
--- 2/t/cond11.sh
+++ b/t/cond11.sh

diff --cc t/cscope.tap
index 9dbe01b2ff0b84af25fe5d724dd0f5490c3e9d3c,29feec2284d8c34e0c0ffcc62d45899e62bb6a58..9dbe01b2ff0b84af25fe5d724dd0f5490c3e9d3c
mode 100755,100644..100644
--- 1/t/cscope.tap
--- 2/t/cscope.tap
+++ b/t/cscope.tap

diff --cc t/cxx-lt-demo.sh
index bbdb93bbf7cb470b92fdcc44431ad8081e7fe776,b778725ba97e4e0ea4f183fa827c92fba1289c2d..bbdb93bbf7cb470b92fdcc44431ad8081e7fe776
mode 100755,100644..100644
--- 1/t/cxx-lt-demo.sh
--- 2/t/cxx-lt-demo.sh
+++ b/t/cxx-lt-demo.sh

diff --cc t/depcomp8a.sh
index d6c73edb7335f3e40239b71dea7f4dce84668e74,aa0be39636d0c4a32023f88610432504edd6a706..d6c73edb7335f3e40239b71dea7f4dce84668e74
mode 100755,100644..100644
--- 1/t/depcomp8a.sh
--- 2/t/depcomp8a.sh
+++ b/t/depcomp8a.sh

diff --cc t/depcomp8b.sh
index 879ee1c0d4e5f5848b2e23701de2ed73adadc258,c2a54da65692b660b8caa9c0bec555321e869029..879ee1c0d4e5f5848b2e23701de2ed73adadc258
mode 100755,100644..100644
--- 1/t/depcomp8b.sh
--- 2/t/depcomp8b.sh
+++ b/t/depcomp8b.sh

diff --cc t/dist-auxdir-many-subdirs.sh
index ec1a9641f2993c8de0a47104b90a995dbb0af018,d49372a1fb393c4a03d33061a2a6de698aba8246..ec1a9641f2993c8de0a47104b90a995dbb0af018
mode 100755,100644..100644
--- 1/t/dist-auxdir-many-subdirs.sh
--- 2/t/dist-auxdir-many-subdirs.sh
+++ b/t/dist-auxdir-many-subdirs.sh

diff --cc t/dist-formats.tap
index bebac374d2904470f20ad8baa209fe618ac76f66,730fa5d0708b3ace0db3d761a34b6eff9b9a4344..bebac374d2904470f20ad8baa209fe618ac76f66
mode 100755,100644..100644
--- 1/t/dist-formats.tap
--- 2/t/dist-formats.tap
+++ b/t/dist-formats.tap

diff --cc t/dist-lzma.sh
index d1d3e4b67664e6477f3b080a02ee2bfbffcf4fe6,30fc689b9cdc3e20b108fa02229f9bca2f74a168..d1d3e4b67664e6477f3b080a02ee2bfbffcf4fe6
mode 100755,100644..100644
--- 1/t/dist-lzma.sh
--- 2/t/lzma.sh
+++ b/t/dist-lzma.sh

diff --cc t/distcom2.sh
index 1f39b6679b7bca269cf6c589c4cbaf6fdb7c1e0d,57154d97c6e3106a80ff3994d07cd26793d5b4bd..1f39b6679b7bca269cf6c589c4cbaf6fdb7c1e0d
mode 100755,100644..100644
--- 1/t/distcom2.sh
--- 2/t/distcom2.sh
+++ b/t/distcom2.sh

diff --cc t/dollarvar2.sh
index ef2dd06af814f4608f472df3b8121b9059a5753f,7183743702131b3e3e8a43a19f72bfa11a682b8c..ef2dd06af814f4608f472df3b8121b9059a5753f
mode 100755,100644..100644
--- 1/t/dollarvar2.sh
--- 2/t/dollarvar2.sh
+++ b/t/dollarvar2.sh

diff --cc t/ext2.sh
index 4858aec6664571362747cff0472853f62fb864d5,108908058f0978c6f775234a6ded8c13f6dc4f91..4858aec6664571362747cff0472853f62fb864d5
mode 100755,100644..100644
--- 1/t/ext2.sh
--- 2/t/ext2.sh
+++ b/t/ext2.sh

diff --cc t/extra-dist-wildcards.sh
index 782b8d772786a153991c9c67cbdae8b636f7e543,5e7ef980149686ee5c09dc76276722ea58523c6b..782b8d772786a153991c9c67cbdae8b636f7e543
mode 100755,100644..100644
--- 1/t/extra-dist-wildcards.sh
--- 2/t/extra-dist-wildcards.sh
+++ b/t/extra-dist-wildcards.sh

diff --cc t/extra-portability.sh
index 63849c7685c68825c2b34edcb33997b1a702e9ad,94dd799e2f98ede106ef4f06b09cdd3bb5e1ff19..63849c7685c68825c2b34edcb33997b1a702e9ad
mode 100755,100644..100644
--- 1/t/extra-portability.sh
--- 2/t/extra-portability.sh
+++ b/t/extra-portability.sh

diff --cc t/extra2.sh
index f3c3f5bdb70db3d57f7b41844394fe979b80ad07,b971a4b875878c68c2b0e5110656144eed6ca854..f3c3f5bdb70db3d57f7b41844394fe979b80ad07
mode 100755,100644..100644
--- 1/t/extra2.sh
--- 2/t/extra2.sh
+++ b/t/extra2.sh

diff --cc t/fort2.sh
index d6144529624898154746ccb074340a2c90e8a0e7,c99e8b70957f196e89b5e5d12204de5355af2d11..d6144529624898154746ccb074340a2c90e8a0e7
mode 100755,100644..100644
--- 1/t/fort2.sh
--- 2/t/fort2.sh
+++ b/t/fort2.sh

diff --cc t/fort4.sh
index 2ef27abebbb3d0941d39ec860efd5dc64bf79166,822edb8c821d5e44ea284c528e800791c2bb92bd..2ef27abebbb3d0941d39ec860efd5dc64bf79166
mode 100755,100644..100644
--- 1/t/fort4.sh
--- 2/t/fort4.sh
+++ b/t/fort4.sh

diff --cc t/fort5.sh
index 7b9991b969211c89e9f796ed18310580b001d6f3,02727061d5aa7ea31182552ebb811f50e6655ef0..7b9991b969211c89e9f796ed18310580b001d6f3
mode 100755,100644..100644
--- 1/t/fort5.sh
--- 2/t/fort5.sh
+++ b/t/fort5.sh

diff --cc t/get-sysconf.sh
index bd4932f4c4b63c9161ffb6a5ac3f2106d14ccfa8,4c681081ed69b5069aecec54c0b77fa3e063da14..bd4932f4c4b63c9161ffb6a5ac3f2106d14ccfa8
mode 100755,100644..100644
--- 1/t/get-sysconf.sh
--- 2/t/get-sysconf.sh
+++ b/t/get-sysconf.sh

diff --cc t/instdir-ltlib.sh
index 273206cbadf5c1655b4d125eb3a90b57c17ba585,32d8d409aff30a96833f7622ffd3e9c65f710eb0..273206cbadf5c1655b4d125eb3a90b57c17ba585
mode 100755,100644..100644
--- 1/t/instdir-ltlib.sh
--- 2/t/instdir-ltlib.sh
+++ b/t/instdir-ltlib.sh

diff --cc t/instdir-prog.sh
index f2b96b8ee58c7ea99f44ee55edb04639aff75147,2fa14e5c359e5d5be67c08408f769a4b11ebc1c5..f2b96b8ee58c7ea99f44ee55edb04639aff75147
mode 100755,100644..100644
--- 1/t/instdir-prog.sh
--- 2/t/instdir-prog.sh
+++ b/t/instdir-prog.sh

diff --cc t/lex-line.sh
index 258f6af56dea8845681059e93b9f79b12a8bb36e,d4340e48849b46b51a90b223f240c5530cd3a171..258f6af56dea8845681059e93b9f79b12a8bb36e
mode 100755,100644..100644
--- 1/t/lex-line.sh
--- 2/t/lex-line.sh
+++ b/t/lex-line.sh

diff --cc t/lex-subobj-nodep.sh
index 75e4f0c431e73287270643e7cd9c958c898c0f27,3282350c2eab8b57cc21ee145a42a119853fabc2..75e4f0c431e73287270643e7cd9c958c898c0f27
mode 100755,100644..100644
--- 1/t/lex-subobj-nodep.sh
--- 2/t/lex-subobj-nodep.sh
+++ b/t/lex-subobj-nodep.sh

diff --cc t/lex5.sh
index 232f77dba986d46336a6c22545d5c673d1257d8f,13c8239e59b596a8584b70cb15a34d511079aa2e..232f77dba986d46336a6c22545d5c673d1257d8f
mode 100755,100644..100644
--- 1/t/lex5.sh
--- 2/t/lex5.sh
+++ b/t/lex5.sh

diff --cc t/libobj19.sh
index 1a4cf23d4cdc32cb1262e2e8caedf60e6a518a98,fdca575b5643a4d32bbda3308d402c142591f5b8..1a4cf23d4cdc32cb1262e2e8caedf60e6a518a98
mode 100755,100644..100644
--- 1/t/libobj19.sh
--- 2/t/libobj19.sh
+++ b/t/libobj19.sh

diff --cc t/libtool3.sh
index 5653280e6ada117a629091ef9cb9b6a0cc1a6230,fb8c194ed84546cd6e898ae79b0620fa11122666..5653280e6ada117a629091ef9cb9b6a0cc1a6230
mode 100755,100644..100644
--- 1/t/libtool3.sh
--- 2/t/libtool3.sh
+++ b/t/libtool3.sh

diff --cc t/libtool9.sh
index bb6ac87d92d973a02e9c8a33ca0a24b1e2d2f11c,26eb5f147afbadd93bcb61debe962f30370a8fed..bb6ac87d92d973a02e9c8a33ca0a24b1e2d2f11c
mode 100755,100644..100644
--- 1/t/libtool9.sh
--- 2/t/libtool9.sh
+++ b/t/libtool9.sh

diff --cc t/ltinstloc.sh
index bae3d49df3e9c38b500a882a8f48a4e237c25a65,b9670cbacb78457740f861739bbdd6aba5c8b119..bae3d49df3e9c38b500a882a8f48a4e237c25a65
mode 100755,100644..100644
--- 1/t/ltinstloc.sh
--- 2/t/ltinstloc.sh
+++ b/t/ltinstloc.sh

diff --cc t/ltlibsrc.sh
index 8c8098bdb7c9a688577c36e686b38137559329a3,e58bba7162ae368cbf672ef591de5ce259f74e62..8c8098bdb7c9a688577c36e686b38137559329a3
mode 100755,100644..100644
--- 1/t/ltlibsrc.sh
--- 2/t/ltlibsrc.sh
+++ b/t/ltlibsrc.sh

diff --cc t/ltorder.sh
index c243ac78b9dc682ecaccecccd1a0a0b89e54e225,fe9d7bda2fc5035fc11e67f6bad7b3dc201e41b4..c243ac78b9dc682ecaccecccd1a0a0b89e54e225
mode 100755,100644..100644
--- 1/t/ltorder.sh
--- 2/t/ltorder.sh
+++ b/t/ltorder.sh

diff --cc t/parallel-tests-suffix-prog.sh
index 7b924a33be5778e5378d1b695104b62cfa89e969,64f103c70ddd7a2a58715505eaf6eb43e74c0854..7b924a33be5778e5378d1b695104b62cfa89e969
mode 100755,100644..100644
--- 1/t/parallel-tests-suffix-prog.sh
--- 2/t/parallel-tests-suffix-prog.sh
+++ b/t/parallel-tests-suffix-prog.sh

diff --cc t/per-target-flags.sh
index d27a2447254617f2b3828a4acb4419a07701adf0,ef19e69253333c6a3053699b0409cb83b043e009..d27a2447254617f2b3828a4acb4419a07701adf0
mode 100755,100644..100644
--- 1/t/per-target-flags.sh
--- 2/t/per-target-flags.sh
+++ b/t/per-target-flags.sh

diff --cc t/pr224.sh
index b6bf6b9861cfaa4357ea5733db7e393b96cc6c26,764d9fb9863b85227ab2a97bf734e600335d5564..b6bf6b9861cfaa4357ea5733db7e393b96cc6c26
mode 100755,100644..100644
--- 1/t/pr224.sh
--- 2/t/pr224.sh
+++ b/t/pr224.sh

diff --cc t/pr401.sh
index 89094de75ad965dcf5ab393c4027c56222a79a23,f3020429e4072a64233a54266c8903c20749c4d1..89094de75ad965dcf5ab393c4027c56222a79a23
mode 100755,100644..100644
--- 1/t/pr401.sh
--- 2/t/pr401.sh
+++ b/t/pr401.sh

diff --cc t/pr401b.sh
index cf7a6988532607f4b9429e90035ddbe152218416,3fa2ad1dbecb667b0c6dd705c8a165ceb0104add..cf7a6988532607f4b9429e90035ddbe152218416
mode 100755,100644..100644
--- 1/t/pr401b.sh
--- 2/t/pr401b.sh
+++ b/t/pr401b.sh

diff --cc t/pr401c.sh
index 22e58762990a2b8f164512baaf3b5c9315f16c3e,07c755d10b0d6078b4dffb62493b1304fac13c71..22e58762990a2b8f164512baaf3b5c9315f16c3e
mode 100755,100644..100644
--- 1/t/pr401c.sh
--- 2/t/pr401c.sh
+++ b/t/pr401c.sh

diff --cc t/python-virtualenv.sh
index faf1d5a50781717e04033066004c7bb9b452d22d,a67e7c2737970d602b42c49771e745756b7bf1f9..faf1d5a50781717e04033066004c7bb9b452d22d
mode 100755,100644..100644
--- 1/t/python-virtualenv.sh
--- 2/t/python-virtualenv.sh
+++ b/t/python-virtualenv.sh

diff --cc t/remake-renamed-m4-macro-and-file.sh
index 9cd3bc995a763b2412e59a8f8389e67d5524ace0,68d188352ba72c0fad4b9d1381cc2d4deb9f6bb2..9cd3bc995a763b2412e59a8f8389e67d5524ace0
mode 100755,100644..100644
--- 1/t/remake-renamed-m4-macro-and-file.sh
--- 2/t/remake-renamed-m4-macro-and-file.sh
+++ b/t/remake-renamed-m4-macro-and-file.sh

diff --cc t/repeated-options.sh
index 95963c547e3ce4a1cf5644bc6ad5f9bf67f71d89,af1897bcba75d2404661ccf8289b9e8e87bbff44..95963c547e3ce4a1cf5644bc6ad5f9bf67f71d89
mode 100755,100644..100644
--- 1/t/repeated-options.sh
--- 2/t/repeated-options.sh
+++ b/t/repeated-options.sh

diff --cc t/silent-c.sh
index 28f1667b6d92e2fdbe33c307f0d4c16184e84a0b,24af8314cdce7120bea872a18e7775506d7f66b3..28f1667b6d92e2fdbe33c307f0d4c16184e84a0b
mode 100755,100644..100644
--- 1/t/silent-c.sh
--- 2/t/silent-c.sh
+++ b/t/silent-c.sh

diff --cc t/silent-lex.sh
index 320e91f1dbccd2bf88f9724b7c5f734516892c5b,018f8a7a9831f334515853a8b29b5fc11300a3f6..320e91f1dbccd2bf88f9724b7c5f734516892c5b
mode 100755,100644..100644
--- 1/t/silent-lex.sh
--- 2/t/silent-lex.sh
+++ b/t/silent-lex.sh

diff --cc t/silent-lt.sh
index 0ae003719f41ace432bf230d9297eab37b464b78,dc9bf2acc8fe49b6e3acb165d90cf8796d76395e..0ae003719f41ace432bf230d9297eab37b464b78
mode 100755,100644..100644
--- 1/t/silent-lt.sh
--- 2/t/silent-lt.sh
+++ b/t/silent-lt.sh

diff --cc t/silent-many-languages.sh
index 5395af6d9656d238232e782a0c02795982679c5c,bffbb6a49f62e862a1c6542dc316b2f8e66c4f09..5395af6d9656d238232e782a0c02795982679c5c
mode 100755,100644..100644
--- 1/t/silent-many-languages.sh
--- 2/t/silent-many-languages.sh
+++ b/t/silent-many-languages.sh

diff --cc t/silent-nested-vars.sh
index f03204d0b0c524197532117ada4295ae2d72e9b1,7dca0569683cb65b6e06d16f9e2a089a9ba3f762..f03204d0b0c524197532117ada4295ae2d72e9b1
mode 100755,100644..100644
--- 1/t/silent-nested-vars.sh
--- 2/t/silent-nested-vars.sh
+++ b/t/silent-nested-vars.sh

diff --cc t/silent-yacc.sh
index bb215189fc4cb73eec2dba9992faa81471ff6f25,5017d50692cca8aab7d6f79cd59c944c1162b846..bb215189fc4cb73eec2dba9992faa81471ff6f25
mode 100755,100644..100644
--- 1/t/silent-yacc.sh
--- 2/t/silent-yacc.sh
+++ b/t/silent-yacc.sh

diff --cc t/sourcefile-in-subdir.sh
index 1054f18aa4fd82733314543475ab4871bf97bb52,a01077617d9b647c319d216068f3e55f950e09c3..1054f18aa4fd82733314543475ab4871bf97bb52
mode 100755,100644..100644
--- 1/t/sourcefile-in-subdir.sh
--- 2/t/sourcefile-in-subdir.sh
+++ b/t/sourcefile-in-subdir.sh

diff --cc t/specflg-dummy.sh
index c1b9cd5cef41dc8f4f759963e0d11a2b4ec4da58,89ac20657fd5efb282b923560d7f46a9aebb5d3f..c1b9cd5cef41dc8f4f759963e0d11a2b4ec4da58
mode 100755,100644..100644
--- 1/t/specflg-dummy.sh
--- 2/t/specflg-dummy.sh
+++ b/t/specflg-dummy.sh

diff --cc t/specflg6.sh
index 8178b344688f9c82483875bdba5218a80dddd3fe,77d837a53f92ab41db0aee5e4000b8df0a34960b..8178b344688f9c82483875bdba5218a80dddd3fe
mode 100755,100644..100644
--- 1/t/specflg6.sh
--- 2/t/specflg6.sh
+++ b/t/specflg6.sh

diff --cc t/specflg7.sh
index 0a40b5debcf27a18cdf520ec06dba15dff150056,ee3786e2337d884ae5ab9a860fa4427ec2d3f3c8..0a40b5debcf27a18cdf520ec06dba15dff150056
mode 100755,100644..100644
--- 1/t/specflg7.sh
--- 2/t/specflg7.sh
+++ b/t/specflg7.sh

diff --cc t/specflg8.sh
index 5e51053ce4411cc46c1da6b59b59b7c42d389d17,3bb785b916b05f54db9b2921f2b381e4648c0560..5e51053ce4411cc46c1da6b59b59b7c42d389d17
mode 100755,100644..100644
--- 1/t/specflg8.sh
--- 2/t/specflg8.sh
+++ b/t/specflg8.sh

diff --cc t/specflg9.sh
index 4f3d3b0c2b79ea5e9657221fc04039944a659a53,0ee90f10ac50fa2ad3be903d4e51d353a2f1535c..4f3d3b0c2b79ea5e9657221fc04039944a659a53
mode 100755,100644..100644
--- 1/t/specflg9.sh
--- 2/t/specflg9.sh
+++ b/t/specflg9.sh

diff --cc t/spy-double-colon.sh
index 6ca3d0f773928dd25f0c64477d00fb8dac70cba1,6ca3d0f773928dd25f0c64477d00fb8dac70cba1..6ca3d0f773928dd25f0c64477d00fb8dac70cba1
mode 100755,100644..100644
--- 1/t/spy-double-colon.sh
--- 2/t/spy.sh
+++ b/t/spy-double-colon.sh

diff --cc t/spy-rm.tap
index 3b8dd2d1087b89793e9b8ef2dfdd9517906da5f7,29840abf4afbc8662dfdd3b8431865aceb76c523..3b8dd2d1087b89793e9b8ef2dfdd9517906da5f7
mode 100755,100644..100644
--- 1/t/spy-rm.tap
--- 2/t/spy-rm.tap
+++ b/t/spy-rm.tap

diff --cc t/subobj-clean-lt-pr10697.sh
index 053ce417797b9bb3819b3ff1364554690981d4fc,ddcd112e95a821766417db9639e9a39d6c1fa968..053ce417797b9bb3819b3ff1364554690981d4fc
mode 100755,100644..100644
--- 1/t/subobj-clean-lt-pr10697.sh
--- 2/t/subobj-clean-lt-pr10697.sh
+++ b/t/subobj-clean-lt-pr10697.sh

diff --cc t/subobj-clean-pr10697.sh
index e244e3d798bd16036d0aef1ab5710d72439d184c,df97f070833e7f817b820c69169df89ad6e7d3eb..e244e3d798bd16036d0aef1ab5710d72439d184c
mode 100755,100644..100644
--- 1/t/subobj-clean-pr10697.sh
--- 2/t/subobj-clean-pr10697.sh
+++ b/t/subobj-clean-pr10697.sh

diff --cc t/subobj.sh
index f595e68ad8ddadbef8051c194612fe56e6108f1b,2431184b65eca10c872aba03738612d5e80d15c8..f595e68ad8ddadbef8051c194612fe56e6108f1b
mode 100755,100644..100644
--- 1/t/subobj.sh
--- 2/t/subobj.sh
+++ b/t/subobj.sh

diff --cc t/subobj11a.sh
index 2ff04b5678a87bfcb272b8c7287348c6bc36bb5e,25cbf4e21bc9f12be5161634be3b5803b2fc9ec7..2ff04b5678a87bfcb272b8c7287348c6bc36bb5e
mode 100755,100644..100644
--- 1/t/subobj11a.sh
--- 2/t/subobj11a.sh
+++ b/t/subobj11a.sh

diff --cc t/subobj11b.sh
index deaa2b68e4d1be4a9fc83c6c3c2cdc730ee73eaa,14970a0e4aa99bb8a3d10b968603d8d4356b62eb..deaa2b68e4d1be4a9fc83c6c3c2cdc730ee73eaa
mode 100755,100644..100644
--- 1/t/subobj11b.sh
--- 2/t/subobj11b.sh
+++ b/t/subobj11b.sh

diff --cc t/subobj11c.sh
index 7476e47c00b18733fcd0185394880a9424c898b0,a8a435b3abffa4ffb8a9a0b89113d4bca0064bed..7476e47c00b18733fcd0185394880a9424c898b0
mode 100755,100644..100644
--- 1/t/subobj11c.sh
--- 2/t/subobj11c.sh
+++ b/t/subobj11c.sh

diff --cc t/subobj4.sh
index dbbed30bec5ce6766f33f80e92a448c98a70e3a7,b1b577d6abe003c615d7df00e79008fd620733e8..dbbed30bec5ce6766f33f80e92a448c98a70e3a7
mode 100755,100644..100644
--- 1/t/subobj4.sh
--- 2/t/subobj4.sh
+++ b/t/subobj4.sh

diff --cc t/subobj5.sh
index 48514235429be6af67aa59d926e5c19767b3c4c1,54823040953f334457c61d21371136a4411e26eb..48514235429be6af67aa59d926e5c19767b3c4c1
mode 100755,100644..100644
--- 1/t/subobj5.sh
--- 2/t/subobj5.sh
+++ b/t/subobj5.sh

diff --cc t/subobj6.sh
index 0e7aa86b6b202894c9d2817d76ab64a7cc04c70e,71755fdb247e74ca1e7a3f25f5be5ceedffadca9..0e7aa86b6b202894c9d2817d76ab64a7cc04c70e
mode 100755,100644..100644
--- 1/t/subobj6.sh
--- 2/t/subobj6.sh
+++ b/t/subobj6.sh

diff --cc t/subobj7.sh
index de73cc2dce6d52645762dd80d6728afa96dd1aa9,2d997c77fb966e5bd1eaa5dc9a66c58ccfade7c0..de73cc2dce6d52645762dd80d6728afa96dd1aa9
mode 100755,100644..100644
--- 1/t/subobj7.sh
--- 2/t/subobj7.sh
+++ b/t/subobj7.sh

diff --cc t/subobj8.sh
index dd03008bf87945e8249db06b7a0353a65cb41ca7,51e1727d765625936835f5e77b14a595fdfaae39..dd03008bf87945e8249db06b7a0353a65cb41ca7
mode 100755,100644..100644
--- 1/t/subobj8.sh
--- 2/t/subobj8.sh
+++ b/t/subobj8.sh

diff --cc t/subpkg-yacc.sh
index 9fc6761907570264143279633212ff407f30b60f,639e4156c1cadb88fe01143219f4c8e4b120b791..9fc6761907570264143279633212ff407f30b60f
mode 100755,100644..100644
--- 1/t/subpkg-yacc.sh
--- 2/t/subpkg-yacc.sh
+++ b/t/subpkg-yacc.sh

diff --cc t/subpkg.sh
index f9cdc74e2bb58bf0de2522d9188be29f3bbc2dea,6f59ac58d018a79005f708184d9589fe2f3afb8f..f9cdc74e2bb58bf0de2522d9188be29f3bbc2dea
mode 100755,100644..100644
--- 1/t/subpkg.sh
--- 2/t/subpkg.sh
+++ b/t/subpkg.sh

diff --cc t/suffix-custom-subobj-and-specflg.sh
index b862d88256ec3edb3af9261be26cf840561a6801,e9f35c771bb9bfad41004b3214ebf0e6ab45ac42..b862d88256ec3edb3af9261be26cf840561a6801
mode 100755,100644..100644
--- 1/t/suffix-custom-subobj-and-specflg.sh
--- 2/t/suffix-custom-subobj-and-specflg.sh
+++ b/t/suffix-custom-subobj-and-specflg.sh

diff --cc t/tar-opts-errors.sh
index befc23f7ecf766b948a25b61d7fb33f0393e0464,befc23f7ecf766b948a25b61d7fb33f0393e0464..befc23f7ecf766b948a25b61d7fb33f0393e0464
mode 100755,100644..100644
--- 1/t/tar-opts-errors.sh
--- 2/t/tar3.sh
+++ b/t/tar-opts-errors.sh

diff --cc t/tar-pax.sh
index 758d89a7dcaec8236fcf8fec7a12221bb106c865,758d89a7dcaec8236fcf8fec7a12221bb106c865..758d89a7dcaec8236fcf8fec7a12221bb106c865
mode 100755,100644..100644
--- 1/t/tar-pax.sh
--- 2/t/tar2.sh
+++ b/t/tar-pax.sh

diff --cc t/tar-ustar.sh
index c146ad98a93ace9b6a07a8e5d2286a029598f74c,c146ad98a93ace9b6a07a8e5d2286a029598f74c..c146ad98a93ace9b6a07a8e5d2286a029598f74c
mode 100755,100644..100644
--- 1/t/tar-ustar.sh
--- 2/t/tar.sh
+++ b/t/tar-ustar.sh

diff --cc t/target-cflags.sh
index 01bcbce931545a18781b0bf8c153f2526f1a140e,3c7d72093b557dd4b965404b92644a85b9cd320f..01bcbce931545a18781b0bf8c153f2526f1a140e
mode 100755,100644..100644
--- 1/t/target-cflags.sh
--- 2/t/target-cflags.sh
+++ b/t/target-cflags.sh

diff --cc t/txinfo23.sh
index 6c2d9ce3cfa7ef702056537cc2ddb94e1a3e6d1c,c2b27976d4d254ed8358aa4793703a088091c45e..6c2d9ce3cfa7ef702056537cc2ddb94e1a3e6d1c
mode 100755,100644..100644
--- 1/t/txinfo23.sh
--- 2/t/txinfo23.sh
+++ b/t/txinfo23.sh

diff --cc t/txinfo24.sh
index 9daa82ec746df185aec918948cccfb7382099e21,bfad312a610a2e76f761847b1629e5795adfdc60..9daa82ec746df185aec918948cccfb7382099e21
mode 100755,100644..100644
--- 1/t/txinfo24.sh
--- 2/t/txinfo24.sh
+++ b/t/txinfo24.sh

diff --cc t/txinfo25.sh
index aad0cb77169760f82fed9a7d2e39b6e32d7242af,369a759430eb1323cbc4b817b3f07fb1b70beabc..aad0cb77169760f82fed9a7d2e39b6e32d7242af
mode 100755,100644..100644
--- 1/t/txinfo25.sh
--- 2/t/txinfo25.sh
+++ b/t/txinfo25.sh

diff --cc t/txinfo28.sh
index 191a218497a6b0f542c24bb6c935f7abcbb50615,171632a6b9e479eb1a362a8e19b0f94673b02060..191a218497a6b0f542c24bb6c935f7abcbb50615
mode 100755,100644..100644
--- 1/t/txinfo28.sh
--- 2/t/txinfo28.sh
+++ b/t/txinfo28.sh

diff --cc t/vala-libs.sh
index f1ed99ab2852a19b47ba2bccdbd84842b961dc6d,f3e905434dc52d42f945d097a0d87f12516ab743..f1ed99ab2852a19b47ba2bccdbd84842b961dc6d
mode 100755,100644..100644
--- 1/t/vala-libs.sh
--- 2/t/vala-libs.sh
+++ b/t/vala-libs.sh

diff --cc t/vala-mix.sh
index 1ac851e0b24e3c962eab8604a60e12a18ef81e69,7b7403d8c2cd8a3a39b6e1e64824c26b0841a9d1..1ac851e0b24e3c962eab8604a60e12a18ef81e69
mode 100755,100644..100644
--- 1/t/vala-mix.sh
--- 2/t/vala-mix.sh
+++ b/t/vala-mix.sh

diff --cc t/vala-non-recursive-setup.sh
index 88f67a8795b87016bd58d3da1adebf0bf08346af,ca65a4f4fdfd7dd913b39c640a38184aaa5b0ea9..88f67a8795b87016bd58d3da1adebf0bf08346af
mode 100755,100644..100644
--- 1/t/vala-non-recursive-setup.sh
--- 2/t/vala-non-recursive-setup.sh
+++ b/t/vala-non-recursive-setup.sh

diff --cc t/vala-per-target-flags.sh
index add07cf336ba5f924be15ddda11d159a75979221,34613650897dd04903148e6388a1d4cfd0023ba4..add07cf336ba5f924be15ddda11d159a75979221
mode 100755,100644..100644
--- 1/t/vala-per-target-flags.sh
--- 2/t/vala-per-target-flags.sh
+++ b/t/vala-per-target-flags.sh

diff --cc t/vala-recursive-setup.sh
index cf7980dd20b3516fffab9f691b4eb1f835145712,5c1f4c653f1c4efccbdee792be6fe8f19702e6c7..cf7980dd20b3516fffab9f691b4eb1f835145712
mode 100755,100644..100644
--- 1/t/vala-recursive-setup.sh
--- 2/t/vala-recursive-setup.sh
+++ b/t/vala-recursive-setup.sh

diff --cc t/vala-vapi.sh
index ce5ca9d73bc06006683c617cd3f28e100e6e6149,9def2538593a3a39e37c32b1bf968f4244b717d8..ce5ca9d73bc06006683c617cd3f28e100e6e6149
mode 100755,100644..100644
--- 1/t/vala-vapi.sh
--- 2/t/vala-vapi.sh
+++ b/t/vala-vapi.sh

diff --cc t/yacc-cxx-grepping.sh
index 07901467343a6efa6a938ca8271d8865865c290f,07901467343a6efa6a938ca8271d8865865c290f..07901467343a6efa6a938ca8271d8865865c290f
mode 100755,100644..100644
--- 1/t/yacc-cxx-grepping.sh
--- 2/t/yaccpp.sh
+++ b/t/yacc-cxx-grepping.sh

diff --cc t/yacc-dist-nobuild-subdir.sh
index 8b7f7ff9bf785aa9a467acf087eee5c8e956fc91,7ea2528842c4fc814202df9aa5535f8bf736da8b..8b7f7ff9bf785aa9a467acf087eee5c8e956fc91
mode 100755,100644..100644
--- 1/t/yacc-dist-nobuild-subdir.sh
--- 2/t/yacc-dist-nobuild-subdir.sh
+++ b/t/yacc-dist-nobuild-subdir.sh

diff --cc t/yacc-dry.sh
index 79cf490ae2667d6907b13f5884738ec88a6da07c,79cf490ae2667d6907b13f5884738ec88a6da07c..79cf490ae2667d6907b13f5884738ec88a6da07c
mode 100755,100644..100644
--- 1/t/yacc-dry.sh
--- 2/t/yaccdry.sh
+++ b/t/yacc-dry.sh

diff --cc t/yacc-grepping2.sh
index 3c5da22557194dabd7959fe22210c136b5f8f8cc,9f20798a2f31119abe9616e5efb5d3ac4c14703f..3c5da22557194dabd7959fe22210c136b5f8f8cc
mode 100755,100644..100644
--- 1/t/yacc-grepping2.sh
--- 2/t/yacc-grepping2.sh
+++ b/t/yacc-grepping2.sh

diff --cc t/yacc-line.sh
index b034af36ef67af9b3efd0e9bffd986a75f5810b0,ed30c56b3239f21991e73cce53f1537ae6cebf48..b034af36ef67af9b3efd0e9bffd986a75f5810b0
mode 100755,100644..100644
--- 1/t/yacc-line.sh
--- 2/t/yacc-line.sh
+++ b/t/yacc-line.sh

diff --cc t/yacc-misc.sh
index bdadd648ea1ce2bbf52ea11c3b9c2dbd487c8af8,bdadd648ea1ce2bbf52ea11c3b9c2dbd487c8af8..bdadd648ea1ce2bbf52ea11c3b9c2dbd487c8af8
mode 100755,100644..100644
--- 1/t/yacc-misc.sh
--- 2/t/yacc4.sh
+++ b/t/yacc-misc.sh

diff --cc t/yacc-subdir.sh
index 95788ec8a7e48d485d771a11e8930e6ea795647d,9db49217819801b36427a63ca44b3aa148d90b93..95788ec8a7e48d485d771a11e8930e6ea795647d
mode 100755,100644..100644
--- 1/t/yacc-subdir.sh
--- 2/t/yacc-subdir.sh
+++ b/t/yacc-subdir.sh

diff --cc t/yacc-vpath.sh
index bd123374ff3a1fa6face93d1b9bee471ac8ef6ec,bd123374ff3a1fa6face93d1b9bee471ac8ef6ec..bd123374ff3a1fa6face93d1b9bee471ac8ef6ec
mode 100755,100644..100644
--- 1/t/yacc-vpath.sh
--- 2/t/yaccvpath.sh
+++ b/t/yacc-vpath.sh