From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 19 Apr 2026 09:44:16 +0000 (+0200)
Subject: [3.13] Prevent GitHub's web conflict editor from converting LF to CRLF (GH-148739... 
X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=66ba1c7cce7c56b8c1f33865e1d60e9121bbd396;p=thirdparty%2FPython%2Fcpython.git

[3.13] Prevent GitHub's web conflict editor from converting LF to CRLF (GH-148739) (#148749)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
---

diff --git a/.gitattributes b/.gitattributes
index eca25b6050cd..bc9328a2b058 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -33,6 +33,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__``.