I'm not really familiar with 3 way diff's, I wasn't aware there was a
way to make them on 9front and I've never really used them, my
apologies.

I've attached the updated diff with no dd(1) regression and sha1.c.

Cheers,
Sean