RIOT/.gitattributes

*.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
make: OSX: don't fail for empty .a archives Fixes issue #1333. 2014-06-19 13:13:06 +02:00			`*.a binary`
.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) 2015-05-09 11:23:09 +02:00			`# 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`