diff --git a/.gitattributes b/.gitattributes index 9fa72ad450..c77bd7c0fb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14,3 +14,4 @@ /Documentation/gitk.txt conflict-marker-size=32 /Documentation/user-manual.txt conflict-marker-size=32 /t/t????-*.sh conflict-marker-size=32 +/t/oid-info/* eol=lf