Advanced diff utility