Use patience diff and some other minor tweaks.