git: union-merge + text for errorlog.md to stop recurring UTF-16/NUL binary conflicts

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-07-22 09:21:02 -07:00
parent eccf9985f7
commit 3089a62521

3
.gitattributes vendored Normal file
View File

@@ -0,0 +1,3 @@
# append/prepend logs: union-merge both machines entries, force text (stop UTF-16/NUL binary conflicts)
errorlog.md merge=union text eol=lf