1
0
Fork 0

Merging upstream version 4.2.0.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-03-20 08:17:16 +01:00
parent f3d71e86d5
commit 4f187f2e34
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
9 changed files with 121 additions and 18 deletions

View file

@ -1,3 +1,16 @@
4.2.0 - 2025-03-18
==================
### Features
- For `language: python` first attempt a versioned python executable for
the default language version before consulting a potentially unversioned
`sys.executable`.
- #3430 PR by @asottile.
### Fixes
- Handle error during conflict detection when a file is named "HEAD"
- #3425 PR by @tusharsadhwani.
4.1.0 - 2025-01-20
==================