Merge branch 'bb/unicode-12.1-reiwa'

[thirdparty/git.git] / .gitattributes

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