From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Aug 2018 18:33:54 +0000 (-0700)
Subject: Merge branch 'js/chain-lint-attrfix'
X-Git-Tag: v2.19.0-rc0~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4601516b418c59a97aab693da7de983289e39a33;p=thirdparty%2Fgit.git

Merge branch 'js/chain-lint-attrfix'

Test fix.

* js/chain-lint-attrfix:
  chainlint: fix for core.autocrlf=true
---

4601516b418c59a97aab693da7de983289e39a33
diff --cc t/.gitattributes
index b17bf71b84,9d09df5a60..e7acedabe1
--- a/t/.gitattributes
+++ b/t/.gitattributes
@@@ -1,7 -1,7 +1,8 @@@
  t[0-9][0-9][0-9][0-9]/* -whitespace
+ /chainlint/*.expect eol=lf
  /diff-lib/* eol=lf
  /t0110/url-* binary
 +/t3206/* eol=lf
  /t3900/*.txt eol=lf
  /t3901/*.txt eol=lf
  /t4034/*/* eol=lf