Merge branch 'backport-4.2-find_package-stack' into find_package-stack

Browse Source

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

...

This commit is contained in:

Brad King

2026-04-01 13:53:41 -04:00

parent aae02ee60a e935ed22fb

commit e8ae3645db

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