Mark Jamsek:

> If I'm right, the below diff should now work with your llvm merge and
> it's still working with the simple hello\nworld\n+fubarEOF case.
> 
> Please let me know if GCNRegPressure.cpp still survives your llvm rebase
> unscathed and without gaining the trailing '\n'
> 
> diffstat f997e889eb0517a24a28f2f4000d6915683fef86 de493b727770ab0c07070cc9aff938371f4e4132
>  M  lib/diff3.c  |  17+  0-

Yes, with this the llvm rebase does not damage any files.

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de