Yes, they are merged. The Facebook guys have been doing a great job optimizing things all over the place (revsets in particular).