Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

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

Merged
hugovk merged 1 commit into
python:3.13python/cpython:3.13from
miss-islington:backport-9e23652-3.13miss-islington/cpython:backport-9e23652-3.13Copy head branch name to clipboard
Apr 19, 2026
Merged

[3.13] Prevent GitHub's web conflict editor from converting LF to CRLF (GH-148739)#148749
hugovk merged 1 commit into
python:3.13python/cpython:3.13from
miss-islington:backport-9e23652-3.13miss-islington/cpython:backport-9e23652-3.13Copy head branch name to clipboard

Conversation

@miss-islington

Copy link
Copy Markdown
Contributor

(cherry picked from commit 9e23652)

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

…onGH-148739)

(cherry picked from commit 9e23652)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@hugovk hugovk enabled auto-merge (squash) April 19, 2026 09:21
@hugovk hugovk merged commit 66ba1c7 into python:3.13 Apr 19, 2026
45 checks passed
@miss-islington miss-islington deleted the backport-9e23652-3.13 branch April 19, 2026 09:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.