Somebody please fund me to make the world's most awesomely great diff tool. Anything and everything we've had to date is just nowhere near what we should have, if our art & industry had any shred of self respect. (But of course that is a true statement about just about every tool involved in software development.)