For anyone who thinks diff / merge should be better - try Beyond Compare from Scooter Software.