marc
/
RIOT
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

.gitattributes: add markdown special case. 

Increase conflict marker size to avoid false positives with git diff --check

(The conflict marker is a line of equals signs `=` which is inserted whenever there is a merge conflict)
This commit is contained in:
Joakim Gebart 2015-05-09 11:23:09 +02:00
parent 45c3498091
commit d3b30417cc
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitattributes vendored
View File

@ -1 +1,6 @@
*.a binary
# Default conflict marker size is 7 which causes some of the headings in
# release-notes.txt to trigger git diff --check: 'leftover conflict marker'
# when the heading is exactly 7 characters long.
*.md conflict-marker-size=100
*.txt conflict-marker-size=100