Merge upstream master to resolve PR conflicts
This commit is contained in:
commit
2ed7adc49f
4 files changed
+11
-10
No files matched your search
@@ -26,6 +26,7 @@
|
||||
|
||||
## Bugfixes
|
||||
- Use the last occurrence of numbering and plain flags in combined short arguments, see #3897 (@cuishuang)
|
||||
- Avoid a spurious Cargo manifest error during installation from Git, see #3899 (@rootsec1)
|
||||
- Avoid repeated scans of long lines in Log syntax highlighting, see #3876 (@Matei02355)
|
||||
- Fix `--list-languages` respecting `--paging=never`, see #3828 (@cyphercodes)
|
||||
- Fix `--sanitize` passing through the bidi control characters U+200E, U+200F and U+061C, see #3862 (@lenamonj)
|
||||
|
||||
Reference in new issue
Block a user