Actually, I pull -s the new file,

	idiff `{yesterday file} file >NEW

Once I'm convinced that NEW is a correct merger,

	cp NEW file

It's a tiny amount of work.