Prevent GitHub's web conflict editor from converting LF to CRLF

hugovk · hugovk · commit 42eb6b026214 · 2026-04-18T23:46:20.000+03:00
diff --git a/.gitattributes b/.gitattributes
@@ -34,6 +34,9 @@ Lib/test/xmltestdata/*                     noeol
 Lib/venv/scripts/common/activate text eol=lf
 Lib/venv/scripts/posix/* text eol=lf
 
+# Prevent GitHub's web conflict editor from converting LF to CRLF
+*.rst text eol=lf
+
 # CRLF files
 [attr]dos text eol=crlf
 
