]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Prevent GitHub's web conflict editor from converting LF to CRLF (#148739)
authorHugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Sun, 19 Apr 2026 09:21:17 +0000 (12:21 +0300)
committerGitHub <noreply@github.com>
Sun, 19 Apr 2026 09:21:17 +0000 (12:21 +0300)
.gitattributes
Misc/NEWS.d/next/Library/2026-02-22-00-00-00.gh-issue-145105.csv-reader-reentrant.rst

index b8189f12ded0f447247fa4359c9be0c26a812e03..f4d65dfd1dfbd3bba0c37bd4ab3d589443894757 100644 (file)
@@ -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
 
index bc61cc43a5aa33995356fb08ab2205ba9e309662..1c2e06c86f658837d08f7a633ce708bbe6abb8b6 100644 (file)
@@ -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__``.