I do agree with dojj, the best way is to fit a different diff altogether, although it maybe costly the first time you do it, but it will also be the last time you do it.