From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Sun, 19 Apr 2026 09:21:17 +0000 (+0300)
Subject: Prevent GitHub's web conflict editor from converting LF to CRLF (#148739)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e236522302a003ae659a825da74501f3aa1c4c1;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/.gitattributes b/.gitattributes
index b8189f12ded0..f4d65dfd1dfb 100644
--- 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 bc61cc43a5aa..1c2e06c86f65 100644
--- 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
-that calls :func:`next` on the same reader from within ``__next__``.
+Fix crash in :mod:`csv` reader when iterating with a re-entrant iterator
+that calls :func:`next` on the same reader from within ``__next__``.