tree 9727394625b8d8a0c966c819bf80a9b12c98814b
parent 895d7c2b1baa8db70bf28e32ab598192bfa14e68
parent 1ea007ec87b468595f95b40d095d09551b058b40
author Kalen Brunham <kalen.brunham@intel.com> 1786993610 +0000
committer Kalen Brunham <kalen.brunham@intel.com> 1786993610 +0000

Merge origin/master into fix/2544

Resolve formatter_test.cc conflict by keeping MacroBeforeCloseParenFormatEquivalent
alongside EndElseIfWithEOLCommentConverges from merged #2541.