Removed references to old diff/merge tools