Merge branch 'jc/maint-combine-diff-pre-context' into maint

diff --git a/t/.gitattributes b/t/.gitattributes
index 562b12e16ebc543db80629d8bcf9499f7a16e74f..ab6edbf19e80a5e07c85ff7cde05061fba349647 100644 (file)
--- a/t/.gitattributes
+++ b/t/.gitattributes
@@ -1 +1,2 @@
-* -whitespace
+t[0-9][0-9][0-9][0-9]-*.sh -whitespace
+t[0-9][0-9][0-9][0-9]/* -whitespace