diff --git a/.gitattributes b/.gitattributes index ff96567ca54d..63161005c748 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,6 +7,7 @@ *.sgml whitespace=space-before-tab,trailing-space,tab-in-indent,-blank-at-eol *.x[ms]l whitespace=space-before-tab,trailing-space,tab-in-indent + # Avoid confusing ASCII underlines with leftover merge conflict markers README conflict-marker-size=32 README.* conflict-marker-size=32