From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 15 Dec 2018 03:24:32 +0000 (+0900)
Subject: Merge branch 'ds/hash-independent-tests-fix' into maint
X-Git-Tag: v2.20.1~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3f8c27c369833ac0eb473cadbec8c9deb0ee311b

Merge branch 'ds/hash-independent-tests-fix' into maint

Test portability fix.

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

3f8c27c369833ac0eb473cadbec8c9deb0ee311b
diff --cc .gitattributes
index acf853e029,4a9e869f02..9fa72ad450
--- a/.gitattributes
+++ b/.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