Merge branch 'ds/hash-independent-tests-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Dec 2018 03:24:32 +0000 (12:24 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Dec 2018 03:24:32 +0000 (12:24 +0900)
Test portability fix.

* ds/hash-independent-tests-fix:
  .gitattributes: ensure t/oid-info/* has eol=lf

1  2 
.gitattributes

diff --cc .gitattributes
@@@ -9,7 -9,4 +9,8 @@@
  /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
 +/t/t????-*.sh conflict-marker-size=32