This should output a diff -u patch. Patches are much quicker to apply than hand editing.