merge: pull in the PR #3050 conflict fix

Browse Source

...

This commit is contained in:

Vance Ingalls

2026-08-12 17:41:24 -07:00

parent 5f70922c46 ccacc78509

commit 1eede7f3da

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