Browse Source

.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)
dev/timer
Joakim Gebart 8 years ago
parent
commit
d3b30417cc
  1. 5
      .gitattributes

5
.gitattributes vendored

@ -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

Loading…
Cancel
Save