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
This commit is contained in:
commit
3f8c27c369
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user