FoldTree: merging in style/format changes in advance of pull request, to make actual changes more obvious