Merge branch 'js/t9902-send-email-completion-fix' into maint

* js/t9902-send-email-completion-fix:
t9902: 'send-email' test case requires PERL

diff --git a/.gitattributes b/.gitattributes
index acf853e0299463a12212e9ed5f35d7f4a9d289af..9fa72ad4503031528e24e7c69f24ca92bcc99914 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,6 +9,7 @@
 /command-list.txt eol=lf
 /GIT-VERSION-GEN eol=lf
 /mergetools/* eol=lf
+/t/oid-info/* eol=lf
 /Documentation/git-merge.txt conflict-marker-size=32
 /Documentation/gitk.txt conflict-marker-size=32
 /Documentation/user-manual.txt conflict-marker-size=32

diff --git a/t/.gitattributes b/t/.gitattributes
index e7acedabe17f033d4205613c9af50152e5cec126..df05434d32cc1fa720d5408c26c22371d1f0e9e8 100644 (file)
--- a/t/.gitattributes
+++ b/t/.gitattributes
@@ -16,6 +16,7 @@ t[0-9][0-9][0-9][0-9]/* -whitespace
 /t4135/* eol=lf
 /t4211/* eol=lf
 /t4252/* eol=lf
+/t4256/1/* eol=lf
 /t5100/* eol=lf
 /t5515/* eol=lf
 /t556x_common eol=lf