daphnediane added a comment. In https://reviews.llvm.org/D21279#663670, @bmharper wrote:
> Thanks - the merge conflicts don't look too bad. I should have it cleaned up > by tomorrow. Have you had a chance to do the merge yet? If not I have a merged version which passes the tests that I could post here if you want. https://reviews.llvm.org/D21279 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
