[6.4.0] Add `--incompatible_merge_fixed_and_default_shell_env`#19319

Merged

iancha1992 merged 4 commits intobazelbuild:release-6.4.0from fmeum:19312-incompatible_merge_fixed_and_default_shell_env

Sep 8, 2023

+130-21

Commits on Sep 6, 2023

Commits on Sep 8, 2023

Merge branch 'release-6.4.0' into 19312-incompatible_merge_fixed_and_default_shell_env
fmeum
authored