FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.13] Prevent GitHub's web conflict editor from converting LF to CRLF (GH-148739) by miss-islington · Pull Request #148749 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hugovk merged 1 commit into from
Apr 19, 2026
Conversation 0 Commits 1 Checks 41 Files changed
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .rst  (1) dotfile  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
3 changes: 3 additions & 0 deletions .gitattributes
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ...EWS.d/next/Library/2026-02-22-00-00-00.gh-issue-145105.csv-reader-reentrant.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -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__``.
Loading
Back | FazBrowse Home | New Git URL