[PATCH 7/7] [doc] ignore conflict markers in gitmergeconflicts.adoc
From: Julia Evans via GitGitGadget <hidden>
Date: 2026-09-24 14:44:33
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Julia Evans <redacted> Signed-off-by: Julia Evans <redacted> --- .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