Prevent GitHub's web conflict editor from converting LF to CRLF (GH-1… · miss-islington/cpython@440fe19 · GitHub

1. miss-islington
2. cpython

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit 440fe19

Browse filesBrowse the repository at this point in the historyBrowse files

hugovk

authored and

miss-islington

committed

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

(cherry picked from commit 9e23652) Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>

1 parent a37b105 commit 440fe19
Copy full SHA for 440fe19

2 files changed

+5-2Lines changed: 5 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .gitattributes
• Misc/NEWS.d/next/Library
  • 2026-02-22-00-00-00.gh-issue-145105.csv-reader-reentrant.rst

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.gitattributes‎

Copy file name to clipboardExpand all lines: .gitattributes

+3Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -34,6 +34,9 @@ Lib/test/xmltestdata/* noeol
34	34	Lib/venv/scripts/common/activate text eol=lf
35	35	Lib/venv/scripts/posix/* text eol=lf
36	36
	37	+ # Prevent GitHub's web conflict editor from converting LF to CRLF
	38	+ *.rst text eol=lf
	39	+
37	40	# CRLF files
38	41	[attr]dos text eol=crlf
39	42

Collapse file

‎Misc/NEWS.d/next/Library/2026-02-22-00-00-00.gh-issue-145105.csv-reader-reentrant.rst‎

Copy file name to clipboard

+2-2Lines changed: 2 additions & 2 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -1,2 +1,2 @@
1		- Fix crash in :mod:`csv` reader when iterating with a re-entrant iterator
2		- that calls :func:`next` on the same reader from within ``__next__``.
	1	+ Fix crash in :mod:`csv` reader when iterating with a re-entrant iterator
	2	+ that calls :func:`next` on the same reader from within ``__next__``.

0 commit comments

Comments

0 (0)