tree a2c6226610801d5c62277c7f19f8d6e5a40969e4
parent af81883c48d88889c628a18ce07137092fc72ccb
parent 09a245fecede6f27898668debe97f338cff00956
author Kalen Brunham <kalen.brunham@intel.com> 1786755139 +0000
committer Kalen Brunham <kalen.brunham@intel.com> 1786755264 +0000

Merge origin/master into fix/2540

Resolve formatter_test.cc conflict by keeping EndElseIfWithEOLCommentConverges
alongside master's newer parameter-declaration alignment tests.