From: Julia Evans via GitGitGadget Date: Thu, 24 Sep 2026 14:44:22 GMT Subject: [PATCH 7/7] [doc] ignore conflict markers in gitmergeconflicts.adoc Message-ID: <4505fdc9a6dec37296952107c90947e43f39bae4.1790261062.git.gitgitgadget@gmail.com> In-Reply-To: From: Julia Evans Signed-off-by: Julia Evans --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 26490ad60a..0a0fc950b1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14,6 +14,7 @@ CODE_OF_CONDUCT.md -whitespace /t/oid-info/* text eol=lf /Documentation/git-merge.adoc conflict-marker-size=32 /Documentation/git-merge-file.adoc conflict-marker-size=32 +/Documentation/gitmergeconflicts.adoc conflict-marker-size=32 /Documentation/gitk.adoc conflict-marker-size=32 /Documentation/user-manual.adoc conflict-marker-size=32 /t/t????-*.sh conflict-marker-size=32 -- gitgitgadget