Merge branch 'master' of http://llvm.org/git/clang
I think we'll need to mainly call out the differences to the function above in the comment.
I'd probably put the Style parameter last.
Nit: I'd put newlines between the #include groups here.
We'll either want to assert that !Replaces.empty() (and document that in the function comment), or do an early exit if that's the case.
This comment doesn't carry it's weight, I think. I'd delete it.
I think we'll want to cut that out for now and implement it so that it works for arbitrary sets of replacements in a follow-up cl.
If the inner functions handle this case correctly, we don't need to handle it here.
If you want to test that breaks happen, it's often better to use a configuration with a smaller column limit.