Sorry, we failed to bringdiff-merge-patch back.

This may have been caused by one of the following -

Thanks toDave Mott for the failwhale