From f8b75ce4553d4255a4d19ee468108d037b46aa37 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 11 May 2018 14:32:19 +0300 Subject: [PATCH] eliminate 'git diff ---check' false alarms for Markdown files --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) 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 -- 2.7.4