Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' of https://github.com/python/cpython into unittes…
…t.mock-getattr

Resolve merge conflicts with the current main branch.
  • Loading branch information
melwitt committed May 4, 2023
commit fcb1fc8cbce649af5cc287b2e35b771a8a479826

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.