Remove diff from head after manual r251942 merge.

Reviewed by:	scottl