Prevent GitHub's web conflict editor from converting LF to CRLF (#148739)

diff --git a/.gitattributes b/.gitattributes
index b8189f12ded0f447247fa4359c9be0c26a812e03..f4d65dfd1dfbd3bba0c37bd4ab3d589443894757 100644 (file)
--- 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
 

diff --git a/Misc/NEWS.d/next/Library/2026-02-22-00-00-00.gh-issue-145105.csv-reader-reentrant.rst b/Misc/NEWS.d/next/Library/2026-02-22-00-00-00.gh-issue-145105.csv-reader-reentrant.rst
index bc61cc43a5aa33995356fb08ab2205ba9e309662..1c2e06c86f658837d08f7a633ce708bbe6abb8b6 100644 (file)
--- a/Misc/NEWS.d/next/Library/2026-02-22-00-00-00.gh-issue-145105.csv-reader-reentrant.rst
+++ b/Misc/NEWS.d/next/Library/2026-02-22-00-00-00.gh-issue-145105.csv-reader-reentrant.rst
@@ -1,2 +1,2 @@
-Fix crash in :mod:`csv` reader when iterating with a re-entrant iterator\r
-that calls :func:`next` on the same reader from within ``__next__``.\r
+Fix crash in :mod:`csv` reader when iterating with a re-entrant iterator
+that calls :func:`next` on the same reader from within ``__next__``.