So there's sdiff. It doesn't apply patches, but it does allow you to compare files and selectively pick which changes should be merged. If you use patchto apply the path then sdiff to compare the patched files with the original and then copy the output over the original this is what you want.