From d3b30417cc32a4fcbfc57149c4b5e9ee83128fb0 Mon Sep 17 00:00:00 2001
From: Joakim Gebart <joakim.gebart@eistec.se>
Date: Sat, 9 May 2015 11:23:09 +0200
Subject: [PATCH] .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)
---
 .gitattributes | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index c9839d64f4..3c04f4f99f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -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
-- 
GitLab