Merge branch 'Integration_4.0.0'

This merge throws away a commit from master which was a duplicate of one on
Integration_4.0.0, and just allows the history to remain mostly-linear.
This commit is contained in:
David Adam 2024-12-17 23:51:30 +08:00
commit 687001f8b7

View File

@ -1,2 +1,2 @@
#RUN: %fish -v #RUN: %fish -v
# CHECK: fish, version {{[-.gabcdeflpha0-9]*(irty)?}} # CHECK: fish, version {{[-.gabcdeflphat0-9]*(irty)?}}