Merge branch 'backport-3.31-ci-xcode-26.4' into backport-4.2-ci-xcode-26.4

Browse Source

Use the `-s ours` merge strategy because we've already made the changes.

...

This commit is contained in:

Brad King

2026-04-02 10:36:06 -04:00

parent 5b32a02230 85da1c5190

commit 97913e9fb8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available