mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
d3b30417cc
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)
7 lines
270 B
Plaintext
7 lines
270 B
Plaintext
*.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
|