/
uis
/
git
/
x
/
uis
/
git
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5d826e9
fc767af
)
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
diff --cc
.gitattributes
index
acf853e
,
4a9e869
..
9fa72ad
---
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