Integrated diffs - stop messing around with patches.