From b1a7ab3c6b742b9a376d2bd793747fb531e211fe Mon Sep 17 00:00:00 2001 From: Vladislav Pavlov Date: Thu, 11 Jun 2026 13:15:28 +0300 Subject: [PATCH] test --- .gitattributes | 1 + 1 file changed, 1 insertion(+) 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