Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ds/hash-independent-tests-fix' into maint
author
Junio C Hamano
<gitster@pobox.com>
Sat, 15 Dec 2018 03:24:32 +0000
(12:24 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 15 Dec 2018 03:24:32 +0000
(12:24 +0900)
Test portability fix.
* ds/hash-independent-tests-fix:
.gitattributes: ensure t/oid-info/* has eol=lf
1
2
.gitattributes
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
5d826e9
fc767af
)
diff --cc
.gitattributes
index acf853e0299463a12212e9ed5f35d7f4a9d289af,4a9e869f027680639623fd4c382469085f61efd9..9fa72ad4503031528e24e7c69f24ca92bcc99914
---
1
/
.gitattributes
---
2
/
.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