From: Alexander Alekhin <alexander.alekhin@intel.com>
Date: Fri, 11 May 2018 11:32:19 +0000 (+0300)
Subject: eliminate 'git diff ---check' false alarms for Markdown files
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1^2~627^2^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8b75ce4553d4255a4d19ee468108d037b46aa37;p=platform%2Fupstream%2Fopencv.git

eliminate 'git diff ---check' false alarms for Markdown files
---

diff --git a/.gitattributes b/.gitattributes
index 3feaef7..94cf879 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -43,6 +43,8 @@
 
 # reST underlines/overlines can look like conflict markers
 *.rst          text conflict-marker-size=80
+# Markdown heading markers can look like conflict markers
+*.md           text conflict-marker-size=200
 
 *.cmake         text whitespace=tabwidth=2
 *.cmakein       text whitespace=tabwidth=2